[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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index ae15bc3..e5fd2bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2012-07-04  Tor Arne Vestbø  <tor.arne.vestbo@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.dumez@intel.com>
 
         [EFL] Enable CSS variables support at compile time

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index ed2d9a7..4925794 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,17 @@
+2012-07-04  Tor Arne Vestbø  <tor.arne.vestbo@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  <yoli@rim.com>
 
         [BlackBerry] Turn on DFGJIT in Platform.h

diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
index 65b377c..306a180 100644 (file)
--- a/Source/WTF/WTF.pri
+++ b/Source/WTF/WTF.pri
@@ -28,7 +28,7 @@ v8 {
     !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) {

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index c7becb0..29c3317 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2012-07-04  Tor Arne Vestbø  <tor.arne.vestbo@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.vestbo@nokia.com>
 
         [Qt] Make use of .qmake.cache for caching features

diff --git a/Source/WebKit/qt/declarative/experimental/experimental.pri b/Source/WebKit/qt/declarative/experimental/experimental.pri
index 20d5452..2586bb7 100644 (file)
--- a/Source/WebKit/qt/declarative/experimental/experimental.pri
+++ b/Source/WebKit/qt/declarative/experimental/experimental.pri
@@ -24,7 +24,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 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}
 

diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri
index a3feb7d..34c6639 100644 (file)
--- a/Source/WebKit/qt/declarative/public.pri
+++ b/Source/WebKit/qt/declarative/public.pri
@@ -24,7 +24,8 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 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) {

diff --git a/Source/api.pri b/Source/api.pri
index 2823b56..e17ea50 100644 (file)
--- a/Source/api.pri
+++ b/Source/api.pri
@@ -132,7 +132,6 @@ WEBKIT += webcore
 
 !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.

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index fc075e5..cc0a6b0 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,21 @@
 2012-07-04  Tor Arne Vestbø  <tor.arne.vestbo@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.vestbo@nokia.com>
+
         [Qt] Remove a few un-needed load(features) after r121777
 
         The features are computed by configure.pro and cached in .qmake.cache.

diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
index f7b83cf..5e5060f 100644 (file)
--- a/Tools/MiniBrowser/qt/MiniBrowser.pro
+++ b/Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -22,7 +22,7 @@ HEADERS += \
 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

diff --git a/Tools/WebKitTestRunner/InjectedBundle/Target.pri b/Tools/WebKitTestRunner/InjectedBundle/Target.pri
index 0374352..1a117de 100644 (file)
--- a/Tools/WebKitTestRunner/InjectedBundle/Target.pri
+++ b/Tools/WebKitTestRunner/InjectedBundle/Target.pri
@@ -50,7 +50,7 @@ HEADERS += \
 
 DESTDIR = $${ROOT_BUILD_DIR}/lib
 
-QT += declarative widgets webkit
+QT += widgets webkit
 
 WEBKIT += wtf javascriptcore webcore
 

diff --git a/Tools/WebKitTestRunner/Target.pri b/Tools/WebKitTestRunner/Target.pri
index e46906c..b3b5c2c 100644 (file)
--- a/Tools/WebKitTestRunner/Target.pri
+++ b/Tools/WebKitTestRunner/Target.pri
@@ -25,7 +25,7 @@ SOURCES += \
 
 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 javascriptcore webkit2