summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2018-11-15 15:40:03 +0100
committerLaszlo Agocs <laszlo.agocs@qt.io>2018-11-16 10:19:44 +0000
commitb8e880e432e5cc640ba1cd95a85ca36c5a1a9a61 (patch)
treeec8c58eb514f1d8060be72057bfa4537d64f3bc0
parent41bdf86429e797ba696d79016721685028cdedaf (diff)
Make manylayersinquick example a manual test for now
Will not productize this in 2.2. Change-Id: I6be378671efba1e99f289955a230ac95bdc91a8d Reviewed-by: Andy Nichols <andy.nichols@qt.io>
-rw-r--r--examples/3dstudioruntime2/3dstudioruntime2.pro3
-rw-r--r--tests/manual/manual.pro3
-rw-r--r--tests/manual/manylayersinquick/main.cpp (renamed from examples/3dstudioruntime2/manylayersinquick/main.cpp)0
-rw-r--r--tests/manual/manylayersinquick/main.qml (renamed from examples/3dstudioruntime2/manylayersinquick/main.qml)0
-rw-r--r--tests/manual/manylayersinquick/manylayers.uia (renamed from examples/3dstudioruntime2/manylayersinquick/manylayers.uia)0
-rw-r--r--tests/manual/manylayersinquick/manylayers.uip (renamed from examples/3dstudioruntime2/manylayersinquick/manylayers.uip)0
-rw-r--r--tests/manual/manylayersinquick/manylayersinquick.pro (renamed from examples/3dstudioruntime2/manylayersinquick/manylayersinquick.pro)0
-rw-r--r--tests/manual/manylayersinquick/manylayersinquick.qrc (renamed from examples/3dstudioruntime2/manylayersinquick/manylayersinquick.qrc)0
8 files changed, 3 insertions, 3 deletions
diff --git a/examples/3dstudioruntime2/3dstudioruntime2.pro b/examples/3dstudioruntime2/3dstudioruntime2.pro
index b60052f..37e384d 100644
--- a/examples/3dstudioruntime2/3dstudioruntime2.pro
+++ b/examples/3dstudioruntime2/3dstudioruntime2.pro
@@ -7,8 +7,7 @@ SUBDIRS += \
qtHaveModule(quick) {
SUBDIRS += simpleqml \
qmldatainput \
- layersinquick \
- manylayersinquick
+ layersinquick
}
qtHaveModule(widgets) {
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 3305255..234578b 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -8,5 +8,6 @@ qtHaveModule(widgets) {
qtHaveModule(quick) {
SUBDIRS += \
qml3dapi \
- pureqml3d
+ pureqml3d \
+ manylayersinquick
}
diff --git a/examples/3dstudioruntime2/manylayersinquick/main.cpp b/tests/manual/manylayersinquick/main.cpp
index f6a5c0c..f6a5c0c 100644
--- a/examples/3dstudioruntime2/manylayersinquick/main.cpp
+++ b/tests/manual/manylayersinquick/main.cpp
diff --git a/examples/3dstudioruntime2/manylayersinquick/main.qml b/tests/manual/manylayersinquick/main.qml
index a1ffa6c..a1ffa6c 100644
--- a/examples/3dstudioruntime2/manylayersinquick/main.qml
+++ b/tests/manual/manylayersinquick/main.qml
diff --git a/examples/3dstudioruntime2/manylayersinquick/manylayers.uia b/tests/manual/manylayersinquick/manylayers.uia
index 828a44b..828a44b 100644
--- a/examples/3dstudioruntime2/manylayersinquick/manylayers.uia
+++ b/tests/manual/manylayersinquick/manylayers.uia
diff --git a/examples/3dstudioruntime2/manylayersinquick/manylayers.uip b/tests/manual/manylayersinquick/manylayers.uip
index 8ed17cd..8ed17cd 100644
--- a/examples/3dstudioruntime2/manylayersinquick/manylayers.uip
+++ b/tests/manual/manylayersinquick/manylayers.uip
diff --git a/examples/3dstudioruntime2/manylayersinquick/manylayersinquick.pro b/tests/manual/manylayersinquick/manylayersinquick.pro
index 2fbd78a..2fbd78a 100644
--- a/examples/3dstudioruntime2/manylayersinquick/manylayersinquick.pro
+++ b/tests/manual/manylayersinquick/manylayersinquick.pro
diff --git a/examples/3dstudioruntime2/manylayersinquick/manylayersinquick.qrc b/tests/manual/manylayersinquick/manylayersinquick.qrc
index a91206f..a91206f 100644
--- a/examples/3dstudioruntime2/manylayersinquick/manylayersinquick.qrc
+++ b/tests/manual/manylayersinquick/manylayersinquick.qrc