Diff
Modified: trunk/ChangeLog (121850 => 121851)
--- trunk/ChangeLog 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/ChangeLog 2012-07-04 14:21:59 UTC (rev 121851)
@@ -1,3 +1,17 @@
+2012-07-04 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Get rid of un-needed QT += declarative for Qt 5
+
+ The declarative module has been renamed to quick1 in Qt 5, and the
+ engine-only module for Qt 5 is named 'qml'. For many of the instances
+ we could just remove 'declarative', since the project file was only
+ used for Qt5/WebKit2 builds. In the other cases the module was wrapped
+ in a haveQt(4) scope.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/api.pri:
+
2012-07-03 Christophe Dumez <christophe.du...@intel.com>
[EFL] Enable CSS variables support at compile time
Modified: trunk/Source/WTF/ChangeLog (121850 => 121851)
--- trunk/Source/WTF/ChangeLog 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WTF/ChangeLog 2012-07-04 14:21:59 UTC (rev 121851)
@@ -1,3 +1,17 @@
+2012-07-04 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Get rid of un-needed QT += declarative for Qt 5
+
+ The declarative module has been renamed to quick1 in Qt 5, and the
+ engine-only module for Qt 5 is named 'qml'. For many of the instances
+ we could just remove 'declarative', since the project file was only
+ used for Qt5/WebKit2 builds. In the other cases the module was wrapped
+ in a haveQt(4) scope.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * WTF.pri:
+
2012-07-03 Yong Li <y...@rim.com>
[BlackBerry] Turn on DFGJIT in Platform.h
Modified: trunk/Source/WTF/WTF.pri (121850 => 121851)
--- trunk/Source/WTF/WTF.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WTF/WTF.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -28,7 +28,7 @@
!haveQt(5): error("To build QtWebKit+V8 you need to use Qt 5")
DEFINES *= WTF_USE_V8=1
INCLUDEPATH += $${ROOT_WEBKIT_DIR}/Source/WebKit/qt/v8/ForwardingHeaders
- QT += v8-private declarative
+ QT += v8-private
}
linux-*:contains(DEFINES, WTF_USE_GSTREAMER=1) {
Modified: trunk/Source/WebKit/qt/ChangeLog (121850 => 121851)
--- trunk/Source/WebKit/qt/ChangeLog 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-07-04 14:21:59 UTC (rev 121851)
@@ -1,3 +1,18 @@
+2012-07-04 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
+ [Qt] Get rid of un-needed QT += declarative for Qt 5
+
+ The declarative module has been renamed to quick1 in Qt 5, and the
+ engine-only module for Qt 5 is named 'qml'. For many of the instances
+ we could just remove 'declarative', since the project file was only
+ used for Qt5/WebKit2 builds. In the other cases the module was wrapped
+ in a haveQt(4) scope.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * declarative/experimental/experimental.pri:
+ * declarative/public.pri:
+
2012-07-03 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
[Qt] Make use of .qmake.cache for caching features
Modified: trunk/Source/WebKit/qt/declarative/experimental/experimental.pri (121850 => 121851)
--- trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WebKit/qt/declarative/experimental/experimental.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -24,7 +24,7 @@
wince*:LIBS += $$QMAKE_LIBS_GUI
-QT += declarative widgets network quick quick-private webkit webkit-private
+QT += widgets network quick quick-private webkit webkit-private
DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}
Modified: trunk/Source/WebKit/qt/declarative/public.pri (121850 => 121851)
--- trunk/Source/WebKit/qt/declarative/public.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/WebKit/qt/declarative/public.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -24,7 +24,8 @@
wince*:LIBS += $$QMAKE_LIBS_GUI
-QT += declarative webkit webkit-private
+QT += webkit webkit-private
+haveQt(4): QT += declarative
haveQt(5): QT += widgets quick quick-private
contains(DEFINES, HAVE_QQUICK1=1) {
Modified: trunk/Source/api.pri (121850 => 121851)
--- trunk/Source/api.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Source/api.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -132,7 +132,6 @@
!no_webkit2 {
WEBKIT += webkit2
- QT += declarative
# Ensure that changes to the WebKit1 and WebKit2 API will trigger a qmake of this
# file, which in turn runs syncqt to update the forwarding headers.
Modified: trunk/Tools/ChangeLog (121850 => 121851)
--- trunk/Tools/ChangeLog 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Tools/ChangeLog 2012-07-04 14:21:59 UTC (rev 121851)
@@ -1,5 +1,21 @@
2012-07-04 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+ [Qt] Get rid of un-needed QT += declarative for Qt 5
+
+ The declarative module has been renamed to quick1 in Qt 5, and the
+ engine-only module for Qt 5 is named 'qml'. For many of the instances
+ we could just remove 'declarative', since the project file was only
+ used for Qt5/WebKit2 builds. In the other cases the module was wrapped
+ in a haveQt(4) scope.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * MiniBrowser/qt/MiniBrowser.pro:
+ * WebKitTestRunner/InjectedBundle/Target.pri:
+ * WebKitTestRunner/Target.pri:
+
+2012-07-04 Tor Arne Vestbø <tor.arne.ves...@nokia.com>
+
[Qt] Remove a few un-needed load(features) after r121777
The features are computed by configure.pro and cached in .qmake.cache.
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowser.pro (121850 => 121851)
--- trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowser.pro 2012-07-04 14:21:59 UTC (rev 121851)
@@ -22,7 +22,7 @@
TARGET = MiniBrowser
DESTDIR = $${ROOT_BUILD_DIR}/bin
-QT += network declarative quick quick-private webkit webkit-private
+QT += network quick quick-private webkit webkit-private
macx: QT += xml
RESOURCES += MiniBrowser.qrc
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri (121850 => 121851)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -50,7 +50,7 @@
DESTDIR = $${ROOT_BUILD_DIR}/lib
-QT += declarative widgets webkit
+QT += widgets webkit
WEBKIT += wtf _javascript_core webcore
Modified: trunk/Tools/WebKitTestRunner/Target.pri (121850 => 121851)
--- trunk/Tools/WebKitTestRunner/Target.pri 2012-07-04 14:07:43 UTC (rev 121850)
+++ trunk/Tools/WebKitTestRunner/Target.pri 2012-07-04 14:21:59 UTC (rev 121851)
@@ -25,7 +25,7 @@
DESTDIR = $${ROOT_BUILD_DIR}/bin
-QT = core gui widgets network declarative testlib quick quick-private webkit
+QT = core gui widgets network testlib quick quick-private webkit
WEBKIT += wtf _javascript_core webkit2
