Title: [121963] trunk/Tools
- Revision
- 121963
- Author
- [email protected]
- Date
- 2012-07-06 06:16:33 -0700 (Fri, 06 Jul 2012)
Log 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 <[email protected]> on 2012-07-06
Reviewed by Tor Arne Vestbø.
* Scripts/webkitdirs.pm:
(qtFeatureDefaults):
* qmake/configure.pri:
* qmake/mkspecs/features/features.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121962 => 121963)
--- trunk/Tools/ChangeLog 2012-07-06 13:15:24 UTC (rev 121962)
+++ trunk/Tools/ChangeLog 2012-07-06 13:16:33 UTC (rev 121963)
@@ -1,5 +1,21 @@
2012-07-06 Oswald Buddenhagen <[email protected]>
+ [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 <[email protected]>
+
[Qt] Don't let qt_webkit.pri proclaim its own location
This won't work any more with recent Qt5 versions, as the forwarding
Modified: trunk/Tools/Scripts/webkitdirs.pm (121962 => 121963)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-07-06 13:15:24 UTC (rev 121962)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-07-06 13:16:33 UTC (rev 121963)
@@ -822,7 +822,7 @@
my $originalCwd = getcwd();
- my $file;
+ my $file = File::Spec->catfile($qmakepath, "configure.pro");
my @buildArgs;
my $qconfigs;
@@ -832,12 +832,9 @@
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`;
Modified: trunk/Tools/qmake/configure.pri (121962 => 121963)
--- trunk/Tools/qmake/configure.pri 2012-07-06 13:15:24 UTC (rev 121962)
+++ trunk/Tools/qmake/configure.pri 2012-07-06 13:16:33 UTC (rev 121963)
@@ -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
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (121962 => 121963)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-06 13:15:24 UTC (rev 121962)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-07-06 13:16:33 UTC (rev 121963)
@@ -212,14 +212,3 @@
# 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")
-}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
