From cf6926229f99fb7caeabd3f3ea19fe86d7a59ee9 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 10 May 2012 15:39:03 +0200 Subject: Don't use QtDeclarative compat module Use QtQml instead. Change-Id: If899ebc1e0b4ea86f0f8d4369fbd3eb5cbb2181c Reviewed-by: Matthew Vogt --- examples/quick/canvas/canvas.pro | 2 +- examples/quick/keyinteraction/keyinteraction.pro | 2 +- examples/quick/mousearea/mousearea.pro | 2 +- examples/quick/positioners/positioners.pro | 2 +- examples/quick/righttoleft/righttoleft.pro | 2 +- examples/quick/shadereffects/shadereffects.pro | 2 +- examples/quick/text/text.pro | 2 +- examples/quick/touchinteraction/touchinteraction.pro | 2 +- tests/auto/headersclean/headersclean.pro | 2 +- tests/auto/headersclean/qt_headersclean_headers.h | 1 - tests/auto/quick/qquickgridview/data/displacedTransitions.qml | 2 +- tests/auto/quick/qquicklistview/data/displacedTransitions.qml | 2 +- tools/easingcurveeditor/easingcurveeditor.pro | 2 +- 13 files changed, 12 insertions(+), 13 deletions(-) diff --git a/examples/quick/canvas/canvas.pro b/examples/quick/canvas/canvas.pro index 5ae914a062..e9e1dcee78 100644 --- 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 890d5b1449..f2e19430a4 100644 --- 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 e9a715aae5..c26d287cf7 100644 --- 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 15530dc89f..dddabfe19e 100644 --- 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 eb1ecbbf18..2e30765ffb 100644 --- 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 04ac62b497..7801e415c0 100644 --- 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 ecd0762eda..ab5c1677a1 100644 --- 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 c56e5c8206..8213d64928 100644 --- 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 379648e950..87e4e0c58c 100644 --- 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 d3f4e4b5c8..1c1147de9c 100644 --- 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 #include #include #include diff --git a/tests/auto/quick/qquickgridview/data/displacedTransitions.qml b/tests/auto/quick/qquickgridview/data/displacedTransitions.qml index 2db06976fb..4abf401840 100644 --- 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