From 6b724d2ee305ec0fb10e06396e0eac56b45e4256 Mon Sep 17 00:00:00 2001 From: "ossy@webkit.org" Date: Fri, 6 Jul 2012 13:16:33 +0000 Subject: [PATCH] [Qt] Unify qtFeatureDefaults code paths MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 on 2012-07-06 Reviewed by Tor Arne Vestbø. * Scripts/webkitdirs.pm: (qtFeatureDefaults): * qmake/configure.pri: * qmake/mkspecs/features/features.prf: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121963 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Tools/ChangeLog | 16 ++++++++++++++++ Tools/Scripts/webkitdirs.pm | 7 ++----- Tools/qmake/configure.pri | 2 +- Tools/qmake/mkspecs/features/features.prf | 11 ----------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Tools/ChangeLog b/Tools/ChangeLog index b06b967..952f8e6 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,5 +1,21 @@ 2012-07-06 Oswald Buddenhagen + [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 + + Reviewed by Tor Arne Vestbø. + + * Scripts/webkitdirs.pm: + (qtFeatureDefaults): + * qmake/configure.pri: + * qmake/mkspecs/features/features.prf: + +2012-07-06 Oswald Buddenhagen + [Qt] Don't let qt_webkit.pri proclaim its own location This won't work any more with recent Qt5 versions, as the forwarding diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm index 26d8bc3..b1d2910 100755 --- a/Tools/Scripts/webkitdirs.pm +++ b/Tools/Scripts/webkitdirs.pm @@ -822,7 +822,7 @@ sub qtFeatureDefaults my $originalCwd = getcwd(); - my $file; + my $file = File::Spec->catfile($qmakepath, "configure.pro"); my @buildArgs; my $qconfigs; @@ -832,12 +832,9 @@ sub qtFeatureDefaults my $dir = File::Spec->catfile(productDir(), "Tools", "qmake"); File::Path::mkpath($dir); chdir $dir or die "Failed to cd into " . $dir . "\n"; - $file = File::Spec->catfile($qmakepath, "configure.pro"); } else { # Do a quick check of the features without running the config tests - # FIXME: When Qt supports it, go through configure.pro but without config tests - $file = File::Spec->catfile($qmakepath, "mkspecs", "features", "features.prf"); - push @buildArgs, "CONFIG+=compute_defaults"; + push @buildArgs, "CONFIG+=quick_check"; } my @defaults = `$qmakecommand @buildArgs -nocache $file 2>&1`; diff --git a/Tools/qmake/configure.pri b/Tools/qmake/configure.pri index 451fe3f..8c009fd 100644 --- a/Tools/qmake/configure.pri +++ b/Tools/qmake/configure.pri @@ -5,7 +5,7 @@ # See 'Tools/qmake/README' for an overview of the build system # ------------------------------------------------------------------- -haveQt(5) { +haveQt(5):!quick_check { load(configure) QMAKE_CONFIG_TESTS_DIR = $$PWD/config.tests diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 68849c0..e76c809 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -212,14 +212,3 @@ for(define, DEFINES) { # Is there a later define that overrides this one? contains(DEFINES, $$opposite): DEFINES -= $$define } - -# ---------------------- The end ---------------------- - -# Used to compute defaults for the build-webkit script -# Don't place anything after this! -CONFIG(compute_defaults) { - # FIXME: We should have configure.pro do this when the config tests - # can be selectivly run. - message(DEFINES: $$DEFINES) - error("Done computing defaults") -} -- 2.7.4