Changeset 121963 in webkit


Ignore:
Timestamp:
Jul 6, 2012 6:16:33 AM (12 years ago)
Author:
Csaba Osztrogonác
Message:

[Qt] Unify qtFeatureDefaults code paths

There's no reason to run qmake on features.prf directly anymore, as we
can selectivly run configure tests in the project file now.

​https://bugs.webkit.org/show_bug.cgi?id=90461

Patch by Oswald Buddenhagen <​oswald.buddenhagen@nokia.com> on 2012-07-06
Reviewed by Tor Arne Vestbø.

  • Scripts/webkitdirs.pm:

(qtFeatureDefaults):

  • qmake/configure.pri:
  • qmake/mkspecs/features/features.prf:
Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r121961 r121963  
     12012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
     2
     3        [Qt] Unify qtFeatureDefaults code paths
     4
     5        There's no reason to run qmake on features.prf directly anymore, as we
     6        can selectivly run configure tests in the project file now.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=90461
     9
     10        Reviewed by Tor Arne Vestbø.
     11
     12        * Scripts/webkitdirs.pm:
     13        (qtFeatureDefaults):
     14        * qmake/configure.pri:
     15        * qmake/mkspecs/features/features.prf:
     16
    1172012-07-06  Oswald Buddenhagen  <oswald.buddenhagen@nokia.com>
    218

  • trunk/Tools/Scripts/webkitdirs.pm

    r121958 r121963  
    823823    my $originalCwd = getcwd();
    824824
    825     my $file;
     825    my $file = File::Spec->catfile($qmakepath, "configure.pro");
    826826    my @buildArgs;
    827827    my $qconfigs;
    … …  
    833833        File::Path::mkpath($dir);
    834834        chdir $dir or die "Failed to cd into " . $dir . "\n";
    835         $file = File::Spec->catfile($qmakepath, "configure.pro");
    836835    } else {
    837836        # Do a quick check of the features without running the config tests
    838         # FIXME: When Qt supports it, go through configure.pro but without config tests
    839         $file = File::Spec->catfile($qmakepath, "mkspecs", "features", "features.prf");
    840         push @buildArgs, "CONFIG+=compute_defaults";
     837        push @buildArgs, "CONFIG+=quick_check";
    841838    }
    842839

  • trunk/Tools/qmake/configure.pri

    r121958 r121963  
    66# -------------------------------------------------------------------
    77
    8 haveQt(5) {
     8haveQt(5):!quick_check {
    99    load(configure)
    1010    QMAKE_CONFIG_TESTS_DIR = $$PWD/config.tests

  • trunk/Tools/qmake/mkspecs/features/features.prf

    r121958 r121963  
    213213    contains(DEFINES, $$opposite): DEFINES -= $$define
    214214}
    215 
    216 # ---------------------- The end ----------------------
    217 
    218 # Used to compute defaults for the build-webkit script
    219 # Don't place anything after this!
    220 CONFIG(compute_defaults) {
    221     # FIXME: We should have configure.pro do this when the config tests
    222     # can be selectivly run.
    223     message(DEFINES: $$DEFINES)
    224     error("Done computing defaults")
    225 }
Note: See TracChangeset for help on using the changeset viewer.