Title: [128176] trunk/Tools
- Revision
- 128176
- Author
- [email protected]
- Date
- 2012-09-11 06:21:53 -0700 (Tue, 11 Sep 2012)
Log Message
[Qt] Fix --qt option to build-webkit
Reviewed by Ossy.
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128175 => 128176)
--- trunk/Tools/ChangeLog 2012-09-11 13:11:22 UTC (rev 128175)
+++ trunk/Tools/ChangeLog 2012-09-11 13:21:53 UTC (rev 128176)
@@ -1,5 +1,14 @@
2012-09-11 Tor Arne Vestbø <[email protected]>
+ [Qt] Fix --qt option to build-webkit
+
+ Reviewed by Ossy.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProjects):
+
+2012-09-11 Tor Arne Vestbø <[email protected]>
+
[Qt] Add a configure step to the Qt build system
This allows building the Qt port using just 'qmake WebKit.pro'. Using
Modified: trunk/Tools/Scripts/webkitdirs.pm (128175 => 128176)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-09-11 13:11:22 UTC (rev 128175)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-09-11 13:21:53 UTC (rev 128176)
@@ -2248,7 +2248,7 @@
} elsif ($passedConfig =~ m/release/i) {
push @buildArgs, "CONFIG+=release";
push @buildArgs, "CONFIG-=debug";
- } else {
+ } elsif ($passedConfig) {
die "Build type $passedConfig is not supported with --qt.\n";
}
push @buildArgs, "CONFIG-=debug_and_release" if ($passedConfig && isDarwin());
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
