diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-15 15:05:37 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-16 10:35:56 +0000 |
| commit | 8944db9302fcf74ac5869da514de61d6a7a3880d (patch) | |
| tree | 200dd80eebcd2ea77269bdb048c74b960d3c1556 /tests/auto/quick3d | |
| parent | 4d999de567dae22c0e92f77b897d9a22be2f98db (diff) | |
Change import name of Qt3D Core from Qt3D 2.0 to Qt3D.Core 2.0
Makes the QML imports consistent with the C++ namespaces.
Change-Id: I8c781a67a9010124bd22bb1fab16c4f1082fd962
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/quick3d')
7 files changed, 17 insertions, 11 deletions
diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createAndRemove.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createAndRemove.qml index 23084bfb0..4db3e0f10 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createAndRemove.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createAndRemove.qml @@ -1,13 +1,11 @@ import QtQml 2.1 -// To avoid clash with Component.onCompleted -// TODO: Export Qt3D::QComponent with a different name -import Qt3D 2.0 as Qt3D +import Qt3D.Core 2.0 -Qt3D.Entity { - Qt3D.NodeInstantiator { +Entity { + NodeInstantiator { objectName: "instantiator1" model: model1 - delegate: Qt3D.Entity { + delegate: Entity { property string datum: model.text } } diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createMultiple.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createMultiple.qml index ad4879c7a..67c1e4fe7 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createMultiple.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createMultiple.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { model: 10 diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml index c2ea5b650..736a02b45 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createNone.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { model: 0 diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/createSingle.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/createSingle.qml index 2816310ec..630da9940 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/createSingle.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/createSingle.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { Entity { diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/inactive.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/inactive.qml index 1edef1e0c..178229059 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/inactive.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/inactive.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { active: false diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/data/stringModel.qml b/tests/auto/quick3d/quick3dnodeinstantiator/data/stringModel.qml index 55f536b1f..431c1ebd8 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/data/stringModel.qml +++ b/tests/auto/quick3d/quick3dnodeinstantiator/data/stringModel.qml @@ -1,5 +1,5 @@ import QtQml 2.1 -import Qt3D 2.0 +import Qt3D.Core 2.0 NodeInstantiator { model: ["alpha", "beta", "gamma", "delta"] diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/quick3dnodeinstantiator.pro b/tests/auto/quick3d/quick3dnodeinstantiator/quick3dnodeinstantiator.pro index f690d2c3b..15435d13e 100644 --- a/tests/auto/quick3d/quick3dnodeinstantiator/quick3dnodeinstantiator.pro +++ b/tests/auto/quick3d/quick3dnodeinstantiator/quick3dnodeinstantiator.pro @@ -7,6 +7,14 @@ SOURCES += \ tst_quick3dnodeinstantiator.cpp HEADERS += stringmodel.h +OTHER_FILES = \ + data/createAndRemove.qml \ + data/createMultiple.qml \ + data/createNone.qml \ + data/createSingle.qml \ + data/inactive.qml \ + data/stringModel.qml + include (../../shared/util.pri) TESTDATA = data/* |