Title: [121544] trunk/Tools
- Revision
- 121544
- Author
- ves...@webkit.org
- Date
- 2012-06-29 03:09:59 -0700 (Fri, 29 Jun 2012)
Log Message
[Qt] Make build-webkit reject uknown configurations, eg. --profile
The qmake-based buildsystem doesn't support it.
Patch by Oswald Buddenhagen <oswald.buddenha...@nokia.com> on 2012-06-29
Reviewed by Tor Arne Vestbø.
* Scripts/webkitdirs.pm:
(buildQMakeProjects):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121543 => 121544)
--- trunk/Tools/ChangeLog 2012-06-29 10:03:14 UTC (rev 121543)
+++ trunk/Tools/ChangeLog 2012-06-29 10:09:59 UTC (rev 121544)
@@ -1,5 +1,16 @@
2012-06-29 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
+ [Qt] Make build-webkit reject uknown configurations, eg. --profile
+
+ The qmake-based buildsystem doesn't support it.
+
+ Reviewed by Tor Arne Vestbø.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProjects):
+
+2012-06-29 Oswald Buddenhagen <oswald.buddenha...@nokia.com>
+
[Qt] Don't add Qt module dependencies in features.prf
The required dependencies are already added in WebCore.pri.
Modified: trunk/Tools/Scripts/webkitdirs.pm (121543 => 121544)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-06-29 10:03:14 UTC (rev 121543)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-06-29 10:09:59 UTC (rev 121544)
@@ -2276,6 +2276,8 @@
} elsif ($passedConfig =~ m/release/i) {
push @buildArgs, "CONFIG+=release";
push @buildArgs, "CONFIG-=debug";
+ } 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
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
