Diff
Modified: trunk/ChangeLog (94865 => 94866)
--- trunk/ChangeLog 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/ChangeLog 2011-09-09 18:11:00 UTC (rev 94866)
@@ -1,3 +1,13 @@
+2011-09-09 Laszlo Gombos <laszlo.1.gom...@nokia.com>
+
+ [Qt] Remove common.pri
+ https://bugs.webkit.org/show_bug.cgi?id=67814
+
+ Reviewed by Andreas Kling.
+
+ * Source/WebKit.pri: Move rules from common.pri to WebKit.pri.
+ * Source/common.pri: Removed.
+
2011-09-08 Mark Pilgrim <pilg...@chromium.org>
Test how HTMLAnchorElement.getParameter reacts to too few arguments
Modified: trunk/Source/_javascript_Core/ChangeLog (94865 => 94866)
--- trunk/Source/_javascript_Core/ChangeLog 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-09-09 18:11:00 UTC (rev 94866)
@@ -1,3 +1,12 @@
+2011-09-09 Laszlo Gombos <laszlo.1.gom...@nokia.com>
+
+ [Qt] Remove common.pri
+ https://bugs.webkit.org/show_bug.cgi?id=67814
+
+ Reviewed by Andreas Kling.
+
+ * _javascript_Core.pri:
+
2011-09-08 Mark Hahnenberg <mhahnenb...@apple.com>
REGRESSION(r94811): Assertion failure in 2 worker tests
Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (94865 => 94866)
--- trunk/Source/_javascript_Core/_javascript_Core.pri 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri 2011-09-09 18:11:00 UTC (rev 94866)
@@ -1,7 +1,5 @@
# _javascript_Core - Qt4 build info
-include(../common.pri)
-
VPATH += $$PWD
# Use a config-specific target to prevent parallel builds file clashes on Mac
Modified: trunk/Source/WebCore/ChangeLog (94865 => 94866)
--- trunk/Source/WebCore/ChangeLog 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Source/WebCore/ChangeLog 2011-09-09 18:11:00 UTC (rev 94866)
@@ -1,3 +1,15 @@
+2011-09-09 Laszlo Gombos <laszlo.1.gom...@nokia.com>
+
+ [Qt] Remove common.pri
+ https://bugs.webkit.org/show_bug.cgi?id=67814
+
+ Reviewed by Andreas Kling.
+
+ No new tests, no change in functionality.
+
+ * CodeGenerators.pri:
+ * WebCore.pri:
+
2011-09-09 Dominic Mazzoni <dmazz...@google.com>
Assert being hit in AccessibilityRenderObject::addChildren()
Modified: trunk/Source/WebCore/CodeGenerators.pri (94865 => 94866)
--- trunk/Source/WebCore/CodeGenerators.pri 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Source/WebCore/CodeGenerators.pri 2011-09-09 18:11:00 UTC (rev 94866)
@@ -1,6 +1,5 @@
# Derived source generators
-include(../common.pri)
include(features.pri)
CONFIG(standalone_package) {
Modified: trunk/Source/WebCore/WebCore.pri (94865 => 94866)
--- trunk/Source/WebCore/WebCore.pri 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Source/WebCore/WebCore.pri 2011-09-09 18:11:00 UTC (rev 94866)
@@ -1,6 +1,5 @@
# Include file for WebCore
-include(../common.pri)
include(features.pri)
# We enable TextureMapper by default; remove this line to enable GraphicsLayerQt.
Modified: trunk/Source/WebKit.pri (94865 => 94866)
--- trunk/Source/WebKit.pri 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Source/WebKit.pri 2011-09-09 18:11:00 UTC (rev 94866)
@@ -136,6 +136,17 @@
_javascript_CORE_JIT = no
}
+contains(_javascript_CORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+contains(_javascript_CORE_JIT,no): DEFINES+=ENABLE_JIT=0
+
+linux-g++ {
+isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
+ message(Using gold linker)
+ QMAKE_LFLAGS+=-fuse-ld=gold
+}
+}
+
+
# Disable dependency to a specific version of a Qt package for non-production builds
symbian:!CONFIG(production):default_deployment.pkg_prerules -= pkg_depends_qt
Deleted: trunk/Source/common.pri (94865 => 94866)
--- trunk/Source/common.pri 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Source/common.pri 2011-09-09 18:11:00 UTC (rev 94866)
@@ -1,12 +0,0 @@
-# common project include file for _javascript_Core and WebCore
-
-contains(_javascript_CORE_JIT,yes): DEFINES+=ENABLE_JIT=1
-contains(_javascript_CORE_JIT,no): DEFINES+=ENABLE_JIT=0
-
-linux-g++ {
-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) {
- message(Using gold linker)
- QMAKE_LFLAGS+=-fuse-ld=gold
-}
-}
-
Modified: trunk/Tools/ChangeLog (94865 => 94866)
--- trunk/Tools/ChangeLog 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Tools/ChangeLog 2011-09-09 18:11:00 UTC (rev 94866)
@@ -1,3 +1,12 @@
+2011-09-09 Laszlo Gombos <laszlo.1.gom...@nokia.com>
+
+ [Qt] Remove common.pri
+ https://bugs.webkit.org/show_bug.cgi?id=67814
+
+ Reviewed by Andreas Kling.
+
+ * Tools.pro:
+
2011-09-09 Kristóf Kosztyó <kkris...@inf.u-szeged.hu>
[NRWT] the nrwt check httpd with --no-http option
Modified: trunk/Tools/Tools.pro (94865 => 94866)
--- trunk/Tools/Tools.pro 2011-09-09 18:08:00 UTC (rev 94865)
+++ trunk/Tools/Tools.pro 2011-09-09 18:11:00 UTC (rev 94866)
@@ -2,7 +2,6 @@
TEMPLATE = subdirs
CONFIG += ordered
-include($$PWD/../Source/common.pri)
include($$PWD/../Source/WebCore/features.pri)
exists($$PWD/QtTestBrowser/QtTestBrowser.pro): SUBDIRS += QtTestBrowser/QtTestBrowser.pro
