Don't use QtDeclarative compat module

Use QtQml instead.

Change-Id: If899ebc1e0b4ea86f0f8d4369fbd3eb5cbb2181c
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>

diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro
index 5ae914a..e9e1dce 100644 (file)
--- a/examples/quick/canvas/canvas.pro
+++ b/examples/quick/canvas/canvas.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick declarative
+QT += quick qml
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/canvas

diff --git a/examples/quick/keyinteraction/keyinteraction.pro b/examples/quick/keyinteraction/keyinteraction.pro
index 890d5b1..f2e1943 100644 (file)
--- a/examples/quick/keyinteraction/keyinteraction.pro
+++ b/examples/quick/keyinteraction/keyinteraction.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick declarative
+QT += quick qml
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/keyinteraction

diff --git a/examples/quick/mousearea/mousearea.pro b/examples/quick/mousearea/mousearea.pro
index e9a715a..c26d287 100644 (file)
--- a/examples/quick/mousearea/mousearea.pro
+++ b/examples/quick/mousearea/mousearea.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick declarative
+QT += quick qml
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/mousearea

diff --git a/examples/quick/positioners/positioners.pro b/examples/quick/positioners/positioners.pro
index 15530dc..dddabfe 100644 (file)
--- a/examples/quick/positioners/positioners.pro
+++ b/examples/quick/positioners/positioners.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick declarative
+QT += quick qml
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/positioners

diff --git a/examples/quick/righttoleft/righttoleft.pro b/examples/quick/righttoleft/righttoleft.pro
index eb1ecbb..2e30765 100644 (file)
--- a/examples/quick/righttoleft/righttoleft.pro
+++ b/examples/quick/righttoleft/righttoleft.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick declarative
+QT += quick qml
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/righttoleft

diff --git a/examples/quick/shadereffects/shadereffects.pro b/examples/quick/shadereffects/shadereffects.pro
index 04ac62b..7801e41 100644 (file)
--- a/examples/quick/shadereffects/shadereffects.pro
+++ b/examples/quick/shadereffects/shadereffects.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick declarative
+QT += quick qml
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/shadereffects

diff --git a/examples/quick/text/text.pro b/examples/quick/text/text.pro
index ecd0762..ab5c167 100644 (file)
--- a/examples/quick/text/text.pro
+++ b/examples/quick/text/text.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick declarative
+QT += quick qml
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/qtquick/text

diff --git a/examples/quick/touchinteraction/touchinteraction.pro b/examples/quick/touchinteraction/touchinteraction.pro
index c56e5c8..8213d64 100644 (file)
--- a/examples/quick/touchinteraction/touchinteraction.pro
+++ b/examples/quick/touchinteraction/touchinteraction.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 
-QT += quick declarative
+QT += quick qml
 SOURCES += main.cpp
 
 target.path = $$[QT_INSTALL_EXAMPLES]/qtdeclarative/quick/touchinteraction

diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro
index 379648e..87e4e0c 100644 (file)
--- a/tests/auto/headersclean/headersclean.pro
+++ b/tests/auto/headersclean/headersclean.pro
@@ -1,4 +1,4 @@
-QT = core testlib declarative qml quick qmltest qmldevtools
+QT = core testlib qml qml quick qmltest qmldevtools
 HEADERSCLEAN_PRI = $${QT.core.sources}/../../tests/auto/other/headersclean/headersclean.pri
 isEmpty(QT.core.sources)|!include($$HEADERSCLEAN_PRI) {
     warning("headersclean.pri from QtCore sources not available.  test disabled")

diff --git a/tests/auto/headersclean/qt_headersclean_headers.h b/tests/auto/headersclean/qt_headersclean_headers.h
index d3f4e4b..1c1147d 100644 (file)
--- a/tests/auto/headersclean/qt_headersclean_headers.h
+++ b/tests/auto/headersclean/qt_headersclean_headers.h
@@ -42,7 +42,6 @@
 #ifndef QT_HEADERSCLEAN_HEADERS
 #define QT_HEADERSCLEAN_HEADERS
 
-#include <QtDeclarative/QtDeclarative>
 #include <QtQml/QtQml>
 #include <QtQmlDevTools/QtQmlDevTools>
 #include <QtQuick/QtQuick>

diff --git a/tests/auto/quick/qquickgridview/data/displacedTransitions.qml b/tests/auto/quick/qquickgridview/data/displacedTransitions.qml
index 2db0697..4abf401 100644 (file)
--- a/tests/auto/quick/qquickgridview/data/displacedTransitions.qml
+++ b/tests/auto/quick/qquickgridview/data/displacedTransitions.qml
@@ -65,7 +65,7 @@ Rectangle {
         property var displacedTargetIndexes: new Array()
         property var displacedTargetItems: new Array()
 
-        // for QDeclarativeListProperty types
+        // for QQmlListProperty types
         function copyList(propList) {
             var temp = new Array()
             for (var i=0; i<propList.length; i++)

diff --git a/tests/auto/quick/qquicklistview/data/displacedTransitions.qml b/tests/auto/quick/qquicklistview/data/displacedTransitions.qml
index 964ded1..573bf2b 100644 (file)
--- a/tests/auto/quick/qquicklistview/data/displacedTransitions.qml
+++ b/tests/auto/quick/qquicklistview/data/displacedTransitions.qml
@@ -56,7 +56,7 @@ Rectangle {
         property var displacedTargetIndexes: new Array()
         property var displacedTargetItems: new Array()
 
-        // for QDeclarativeListProperty types
+        // for QQmlListProperty types
         function copyList(propList) {
             var temp = new Array()
             for (var i=0; i<propList.length; i++)

diff --git a/tools/easingcurveeditor/easingcurveeditor.pro b/tools/easingcurveeditor/easingcurveeditor.pro
index fa5aea8..78f2ebf 100644 (file)
--- a/tools/easingcurveeditor/easingcurveeditor.pro
+++ b/tools/easingcurveeditor/easingcurveeditor.pro
@@ -2,7 +2,7 @@ TEMPLATE = app
 DEPENDPATH += .
 INCLUDEPATH += .
 
-QT += declarative quick widgets
+QT += qml quick widgets
 CONFIG -= app_bundle
 
 # Input