diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2012-11-25 04:36:33 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 17:48:46 +0100 |
| commit | e0cb13a510c0099784fee00d5b4b7c608dd42dd2 (patch) | |
| tree | 8d61daaaa70df2fa7b26a0c989d748fc3718e15f /tests/auto/qml/qqmlengine | |
| parent | 55f6a109e99ea2eb3359fa941a1826d4b4e11bf8 (diff) | |
Move no-Gui related QML types from QtQuick into QtQml
Task-number: QTBUG-26340
Change-Id: I9049128db2598bf3c7a9d677b774eaae53b54eb5
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'tests/auto/qml/qqmlengine')
| -rw-r--r-- | tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml | 3 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlengine/tst_qqmlengine.cpp | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml b/tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml index 7a4fe5ed24..26018b5782 100644 --- a/tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml +++ b/tests/auto/qml/qqmlengine/data/qtqmlModule.5.qml @@ -2,4 +2,7 @@ import QtQml 2.0 QtObject { property Component c + property Timer timer + property Connections connections: Connections {} + property Binding binding } diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp index 937a8b1c56..128294bbcb 100644 --- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp +++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp @@ -593,7 +593,7 @@ void tst_qqmlengine::qtqmlModule_data() << QString(testFileUrl("qtqmlModule.4.qml").toString() + QLatin1String(":1 module \"QtQml\" version 2.5 is not installed\n")) << QStringList(); - QTest::newRow("QtQml 2.0 module provides Component and QtObject") + QTest::newRow("QtQml 2.0 module provides Component, QtObject, Connections, Binding and Timer") << testFileUrl("qtqmlModule.5.qml") << QString() << QStringList(); |