Title: [97622] trunk/Tools
- Revision
- 97622
- Author
- [email protected]
- Date
- 2011-10-17 08:26:55 -0700 (Mon, 17 Oct 2011)
Log Message
[Qt][WK2] Build dependency problems
https://bugs.webkit.org/show_bug.cgi?id=68456
Patch by Kristóf Kosztyó <[email protected]> on 2011-10-17
Reviewed by Csaba Osztrogonác.
* Scripts/webkitdirs.pm:
(buildQMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (97621 => 97622)
--- trunk/Tools/ChangeLog 2011-10-17 14:53:37 UTC (rev 97621)
+++ trunk/Tools/ChangeLog 2011-10-17 15:26:55 UTC (rev 97622)
@@ -1,3 +1,13 @@
+2011-10-17 Kristóf Kosztyó <[email protected]>
+
+ [Qt][WK2] Build dependency problems
+ https://bugs.webkit.org/show_bug.cgi?id=68456
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProject):
+
2011-10-17 Holger Hans Peter Freyther <[email protected]>
[build] Introduce Qt/SH4 buildbot
Modified: trunk/Tools/Scripts/webkitdirs.pm (97621 => 97622)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-10-17 14:53:37 UTC (rev 97621)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-10-17 15:26:55 UTC (rev 97622)
@@ -1706,8 +1706,14 @@
my $dir = File::Spec->canonpath(productDir());
my $originalCwd = getcwd();
- chdir File::Spec->catfile(sourceDir(), "Source", "WebCore");
- my $defaults = `$qmakebin CONFIG+=compute_defaults 2>&1`;
+ my $configArgs = "CONFIG+=compute_defaults";
+ if (isWK2()) {
+ chdir File::Spec->catfile(sourceDir(), "Source", "WebKit2");
+ $configArgs = "CONFIG+=webkit2 $configArgs";
+ } else {
+ chdir File::Spec->catfile(sourceDir(), "Source", "WebCore");
+ }
+ my $defaults = `$qmakebin $configArgs 2>&1`;
chdir $originalCwd;
# On Symbian qmake needs to run in the same directory where the pro file is located.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
