[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
vestbo at webkit.org
vestbo at webkit.org
Thu Apr 8 01:12:47 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 602a792a8a3ddfcca62a5ece48707a106cdde8d4
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 18 15:11:06 2010 +0000
[Qt] Force qmake to generate a single makefile for DerivedSources.pro
Reviewed by Simon Hausmann.
JavaScriptCore:
* DerivedSources.pro:
WebCore:
* DerivedSources.pro:
WebKitTools:
* Scripts/webkitdirs.pm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53408 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 797cff3..0f1498d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-18 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Force qmake to generate a single makefile for DerivedSources.pro
+
+ * DerivedSources.pro:
+
2010-01-18 Csaba Osztrogonác <ossy at webkit.org>
Rubber-stamped by Gustavo Noronha Silva.
diff --git a/JavaScriptCore/DerivedSources.pro b/JavaScriptCore/DerivedSources.pro
index a32913a..8f3cfbf 100644
--- a/JavaScriptCore/DerivedSources.pro
+++ b/JavaScriptCore/DerivedSources.pro
@@ -1,5 +1,7 @@
# DerivedSources - qmake build info
+CONFIG -= debug_and_release
+
TEMPLATE = lib
TARGET = dummy
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 553c3f4..9cb71a6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-18 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Force qmake to generate a single makefile for DerivedSources.pro
+
+ * DerivedSources.pro:
+
2010-01-18 Jonathan Dixon <joth at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/DerivedSources.pro b/WebCore/DerivedSources.pro
index c106d5b..7d6a105 100644
--- a/WebCore/DerivedSources.pro
+++ b/WebCore/DerivedSources.pro
@@ -3,6 +3,8 @@
TEMPLATE = lib
TARGET = dummy
+CONFIG -= debug_and_release
+
QMAKE_EXTRA_TARGETS += generated_files
defineTest(addExtraCompiler) {
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6caba81..b027008 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-18 Tor Arne Vestbø <tor.arne.vestbo at nokia.com>
+
+ Reviewed by Simon Hausmann.
+
+ [Qt] Force qmake to generate a single makefile for DerivedSources.pro
+
+ * Scripts/webkitdirs.pm:
+
2010-01-18 Adam Roben <aroben at apple.com>
Clean up use of /useenv when invoking Visual C++
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 98a47f6..d667a8a 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1482,8 +1482,6 @@ sub buildQMakeProject($@)
push @dsQmakeArgs, "-r";
push @dsQmakeArgs, sourceDir() . "/DerivedSources.pro";
push @dsQmakeArgs, "-o Makefile.DerivedSources";
- push @dsQmakeArgs, "CONFIG-=release";
- push @dsQmakeArgs, "CONFIG+=debug";
print "Calling '$qmakebin @dsQmakeArgs' in " . $dir . "\n\n";
my $result = system "$qmakebin @dsQmakeArgs";
if ($result ne 0) {
@@ -1491,9 +1489,6 @@ sub buildQMakeProject($@)
}
my $dsMakefile = "Makefile.DerivedSources";
- # This is to overcome a problem of qmake when generating Makefiles with extra targets for windows.
- # The configuration doesn't matter for source generation, just use debug.
- $dsMakefile .= ".Debug" if ((isCygwin() || isWindows()) && !isSymbian());
print "Calling '$make $makeargs -f $dsMakefile generated_files' in " . $dir . "/JavaScriptCore\n\n";
if ($make eq "nmake") {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list