Title: [124607] trunk/Tools
- Revision
- 124607
- Author
- [email protected]
- Date
- 2012-08-03 07:10:27 -0700 (Fri, 03 Aug 2012)
Log Message
[Qt] Move build config default to build-webkit instead of default_pre
Allows the qmake buildsystem have its own default.
Patch by Oswald Buddenhagen <[email protected]> on 2012-08-03
Reviewed by Tor Arne Vestbø.
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
* qmake/mkspecs/features/default_pre.prf:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (124606 => 124607)
--- trunk/Tools/ChangeLog 2012-08-03 14:07:44 UTC (rev 124606)
+++ trunk/Tools/ChangeLog 2012-08-03 14:10:27 UTC (rev 124607)
@@ -1,3 +1,15 @@
+2012-08-03 Oswald Buddenhagen <[email protected]>
+
+ [Qt] Move build config default to build-webkit instead of default_pre
+
+ Allows the qmake buildsystem have its own default.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProjects):
+ * qmake/mkspecs/features/default_pre.prf:
+
2012-08-03 Mario Sanchez Prada <[email protected]>
Unreviewed build fix for GTK after r124581.
Modified: trunk/Tools/Scripts/webkitdirs.pm (124606 => 124607)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-08-03 14:07:44 UTC (rev 124606)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-08-03 14:10:27 UTC (rev 124607)
@@ -2311,10 +2311,10 @@
if ($passedConfig =~ m/debug/i) {
push @buildArgs, "CONFIG-=release";
push @buildArgs, "CONFIG+=debug";
- } elsif ($passedConfig =~ m/release/i) {
+ } elsif (!$passedConfig or $passedConfig =~ m/release/i) {
push @buildArgs, "CONFIG+=release";
push @buildArgs, "CONFIG-=debug";
- } elsif ($passedConfig) {
+ } else {
die "Build type $passedConfig is not supported with --qt.\n";
}
push @buildArgs, "CONFIG-=debug_and_release" if ($passedConfig && isDarwin());
Modified: trunk/Tools/qmake/mkspecs/features/default_pre.prf (124606 => 124607)
--- trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-08-03 14:07:44 UTC (rev 124606)
+++ trunk/Tools/qmake/mkspecs/features/default_pre.prf 2012-08-03 14:10:27 UTC (rev 124607)
@@ -16,12 +16,6 @@
pro_file = $$_PRO_FILE_ # Checking the variable directly does not work
isEmpty(pro_file): CONFIG += recursive_include
-# We default to release builds
-!build_pass {
- CONFIG += release
- CONFIG -= debug
-}
-
# Resolve root directories for source and build
ROOT_WEBKIT_DIR = $$replace(PWD, /Tools/qmake/mkspecs/features$,)
WEBKIT_SUBDIR = $$replace(_PRO_FILE_PWD_, $${ROOT_WEBKIT_DIR},)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
