Diff
Modified: trunk/ChangeLog (96856 => 96857)
--- trunk/ChangeLog 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/ChangeLog 2011-10-06 21:26:33 UTC (rev 96857)
@@ -1,3 +1,13 @@
+2011-10-06 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt][Wk2] Fix build with Qt 5 when QtScript is built as standalone module
+ https://bugs.webkit.org/show_bug.cgi?id=69520
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/WebKit.pri: Introduce convenience qt5 scope.
+ * Source/WebKit.pro: Replace QT_MAJOR_VERSION stuff with qt5 scope.
+
2011-10-06 Nayan Kumar K <naya...@motorola.com>
Provide configure option to switch between JSC and V8.
Modified: trunk/Source/WebCore/ChangeLog (96856 => 96857)
--- trunk/Source/WebCore/ChangeLog 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebCore/ChangeLog 2011-10-06 21:26:33 UTC (rev 96857)
@@ -1,3 +1,13 @@
+2011-10-06 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt][Wk2] Fix build with Qt 5 when QtScript is built as standalone module
+ https://bugs.webkit.org/show_bug.cgi?id=69520
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WebCore.pri: Use qt5 scope.
+ * WebCore.pro: Use qt5 scope and pull in QtScript for the time being.
+
2011-10-06 Tony Chang <t...@chromium.org>
last frame of a multipart response is not displayed
Modified: trunk/Source/WebCore/WebCore.pri (96856 => 96857)
--- trunk/Source/WebCore/WebCore.pri 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebCore/WebCore.pri 2011-10-06 21:26:33 UTC (rev 96857)
@@ -29,7 +29,7 @@
V8_LIB_DIR = "$$[QT_INSTALL_PREFIX]/src/script/v8"
v8 {
- lessThan(QT_MAJOR_VERSION, 5): error("To build QtWebKit+V8 you need qtscript-staging's v8 branch. (See: http://qt.gitorious.org/+qt-developers/qt/qtscript-staging)")
+ !qt5: error("To build QtWebKit+V8 you need qtscript-staging's v8 branch. (See: http://qt.gitorious.org/+qt-developers/qt/qtscript-staging)")
!exists($${V8_DIR}$${QMAKE_DIR_SEP}include$${QMAKE_DIR_SEP}v8.h): error("Cannot build with V8. Needed file $${V8_DIR}$${QMAKE_DIR_SEP}include$${QMAKE_DIR_SEP}v8.h does not exist.")
!exists($${V8_LIB_DIR}$${QMAKE_DIR_SEP}libv8.a): error("Cannot build with V8. Needed library $${V8_LIB_DIR}$${QMAKE_DIR_SEP}libv8.a does not exist.")
@@ -334,7 +334,7 @@
unix|win32-g++* {
QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
- greaterThan(QT_MAJOR_VERSION, 4): QMAKE_PKGCONFIG_REQUIRES += QtWidgets
+ qt5: QMAKE_PKGCONFIG_REQUIRES += QtWidgets
}
unix:!mac:!symbian:CONFIG += link_pkgconfig
Modified: trunk/Source/WebCore/WebCore.pro (96856 => 96857)
--- trunk/Source/WebCore/WebCore.pro 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebCore/WebCore.pro 2011-10-06 21:26:33 UTC (rev 96857)
@@ -3871,3 +3871,9 @@
SOURCES += platform/graphics/cairo/OpenGLShims.cpp
DEFINES += QT_OPENGL_SHIMS=1
}
+
+qt5 {
+ # Add a QtScript dependency for the time being, in order to pull in the include
+ # path for QtScript when it's built as a standalone module
+ QT += script
+}
Modified: trunk/Source/WebKit/qt/ChangeLog (96856 => 96857)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-06 21:26:33 UTC (rev 96857)
@@ -1,3 +1,14 @@
+2011-10-06 Simon Hausmann <simon.hausm...@nokia.com>
+
+ [Qt][Wk2] Fix build with Qt 5 when QtScript is built as standalone module
+ https://bugs.webkit.org/show_bug.cgi?id=69520
+
+ Reviewed by Csaba Osztrogonác.
+
+ * QtWebKit.pro: Convenience, use qt5 scope.
+ * declarative/declarative.pro: Ditto.
+ * tests/tests.pri: Ditto.
+
2011-10-03 Pierre Rossi <pierre.ro...@gmail.com>
[Qt] Build fix: Qt::escape is deprecated in Qt5
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (96856 => 96857)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-10-06 21:26:33 UTC (rev 96857)
@@ -41,7 +41,7 @@
# the generated includes are containing the dependencies.
# It used to be in WebCore.pro but now that this is the main pro file it has to be here.
QT += network
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
+qt5: QT += widgets printsupport
isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..
Modified: trunk/Source/WebKit/qt/declarative/declarative.pro (96856 => 96857)
--- trunk/Source/WebKit/qt/declarative/declarative.pro 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebKit/qt/declarative/declarative.pro 2011-10-06 21:26:33 UTC (rev 96857)
@@ -40,7 +40,7 @@
include(../../../WebKit.pri)
QT += declarative
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+qt5: QT += widgets
contains(QT_CONFIG, qtquick1): {
QT += qtquick1
Modified: trunk/Source/WebKit/qt/tests/tests.pri (96856 => 96857)
--- trunk/Source/WebKit/qt/tests/tests.pri 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebKit/qt/tests/tests.pri 2011-10-06 21:26:33 UTC (rev 96857)
@@ -21,12 +21,12 @@
include(../../../WebKit.pri)
QT += testlib network
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+qt5: QT += widgets
-lessThan(QT_MAJOR_VERSION, 5) {
+qt5 {
+ contains(QT_CONFIG, qtquick1): QT += declarative qtquick1
+} else {
contains(QT_CONFIG, declarative): QT += declarative
-} else {
- contains(QT_CONFIG, qtquick1): QT += declarative qtquick1
}
QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
Modified: trunk/Source/WebKit.pri (96856 => 96857)
--- trunk/Source/WebKit.pri 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebKit.pri 2011-10-06 21:26:33 UTC (rev 96857)
@@ -2,6 +2,9 @@
contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded
+# For convenience
+greaterThan(QT_MAJOR_VERSION, 4): CONFIG += qt5
+
# Detect that we are building as a standalone package by the presence of
# either the generated files directory or as part of the Qt package through
# QTDIR_build
Modified: trunk/Source/WebKit.pro (96856 => 96857)
--- trunk/Source/WebKit.pro 2011-10-06 21:06:40 UTC (rev 96856)
+++ trunk/Source/WebKit.pro 2011-10-06 21:26:33 UTC (rev 96857)
@@ -9,7 +9,7 @@
}
webkit2 {
- lessThan(QT_MAJOR_VERSION, 5) {
+ !qt5 {
message("Building WebKit2 with Qt versions older than 5.0 is no longer supported.")
message("Read http://www.mail-archive.com/webkit-qt@lists.webkit.org/msg01674.html for more information.")
error("Aborting build.")
@@ -17,7 +17,7 @@
exists($$PWD/WebKit2/WebKit2.pro): SUBDIRS += WebKit2/WebKit2.pro
}
-greaterThan(QT_MAJOR_VERSION, 4) {
+qt5 {
isEmpty(QT.widgets.name)|isEmpty(QT.printsupport.name) {
message("Building WebKit against Qt 5.0 requires the QtWidgets and QtPrintSupport modules.")
error("Aborting build.")
@@ -34,10 +34,10 @@
}
exists($$PWD/WebKit/qt/declarative) {
- lessThan(QT_MAJOR_VERSION, 5) {
+ qt5 {
+ contains(QT_CONFIG, qtquick1): SUBDIRS += WebKit/qt/declarative
+ } else {
contains(QT_CONFIG, declarative): SUBDIRS += WebKit/qt/declarative
- } else {
- contains(QT_CONFIG, qtquick1): SUBDIRS += WebKit/qt/declarative
}
}
