diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-05-10 15:39:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-11 09:34:46 +0200 |
| commit | cf6926229f99fb7caeabd3f3ea19fe86d7a59ee9 (patch) | |
| tree | 166b089ec959d29abdab853620690a08fb4b3085 /tests/auto | |
| parent | 50482f69af0b9392424dfdad5376fcb09be36d46 (diff) | |
Don't use QtDeclarative compat module
Use QtQml instead.
Change-Id: If899ebc1e0b4ea86f0f8d4369fbd3eb5cbb2181c
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'tests/auto')
4 files changed, 3 insertions, 4 deletions
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 <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 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<propList.length; i++) diff --git a/tests/auto/quick/qquicklistview/data/displacedTransitions.qml b/tests/auto/quick/qquicklistview/data/displacedTransitions.qml index 964ded10ee..573bf2b1ae 100644 --- 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++) |