diff options
| author | Robert Brock <robert.brock@kdab.com> | 2016-05-09 12:12:04 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-15 13:45:11 +0000 |
| commit | b4e3be3f03c00cced348cd33541ab50d71495aaf (patch) | |
| tree | 0c56e224795377e643a697f0062df23b822c900f | |
| parent | a60a64eb932c8c9ac30ab1bdbaea10e08a382661 (diff) | |
Moved simple-shaders-qml example to manual test
Part of an examples cleanup
Change-Id: I2f23a68dcc712b9dcf2c3448e8e3ad258ed88b3e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | examples/qt3d/qt3d.pro | 1 | ||||
| -rw-r--r-- | tests/manual/manual.pro | 3 | ||||
| -rw-r--r-- | tests/manual/simple-shaders-qml/main.cpp (renamed from examples/qt3d/simple-shaders-qml/main.cpp) | 0 | ||||
| -rw-r--r-- | tests/manual/simple-shaders-qml/main.qml (renamed from examples/qt3d/simple-shaders-qml/main.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/simple-shaders-qml/simple-shader.frag (renamed from examples/qt3d/simple-shaders-qml/simple-shader.frag) | 0 | ||||
| -rw-r--r-- | tests/manual/simple-shaders-qml/simple-shader.vert (renamed from examples/qt3d/simple-shaders-qml/simple-shader.vert) | 0 | ||||
| -rw-r--r-- | tests/manual/simple-shaders-qml/simple-shaders-qml.pro (renamed from examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro) | 4 | ||||
| -rw-r--r-- | tests/manual/simple-shaders-qml/simple-shaders-qml.qrc (renamed from examples/qt3d/simple-shaders-qml/simple-shaders-qml.qrc) | 0 |
8 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/qt3d.pro b/examples/qt3d/qt3d.pro index 1164ac16a..746f7c050 100644 --- a/examples/qt3d/qt3d.pro +++ b/examples/qt3d/qt3d.pro @@ -14,7 +14,6 @@ SUBDIRS += \ skybox \ controls \ anaglyph-rendering \ - simple-shaders-qml \ planets-qml \ transparency-qml \ transparency-qml-scene3d \ diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index b585ca7dd..735d85d01 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -22,4 +22,5 @@ SUBDIRS += \ mouseinput-qml \ picking-qml \ plasma \ - scene3d-loader + scene3d-loader \ + simple-shaders-qml diff --git a/examples/qt3d/simple-shaders-qml/main.cpp b/tests/manual/simple-shaders-qml/main.cpp index 41d2f08a5..41d2f08a5 100644 --- a/examples/qt3d/simple-shaders-qml/main.cpp +++ b/tests/manual/simple-shaders-qml/main.cpp diff --git a/examples/qt3d/simple-shaders-qml/main.qml b/tests/manual/simple-shaders-qml/main.qml index ae3e948e3..ae3e948e3 100644 --- a/examples/qt3d/simple-shaders-qml/main.qml +++ b/tests/manual/simple-shaders-qml/main.qml diff --git a/examples/qt3d/simple-shaders-qml/simple-shader.frag b/tests/manual/simple-shaders-qml/simple-shader.frag index 330899070..330899070 100644 --- a/examples/qt3d/simple-shaders-qml/simple-shader.frag +++ b/tests/manual/simple-shaders-qml/simple-shader.frag diff --git a/examples/qt3d/simple-shaders-qml/simple-shader.vert b/tests/manual/simple-shaders-qml/simple-shader.vert index ab8e4a0af..ab8e4a0af 100644 --- a/examples/qt3d/simple-shaders-qml/simple-shader.vert +++ b/tests/manual/simple-shaders-qml/simple-shader.vert diff --git a/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro b/tests/manual/simple-shaders-qml/simple-shaders-qml.pro index e7c398b4b..76c6c5039 100644 --- a/examples/qt3d/simple-shaders-qml/simple-shaders-qml.pro +++ b/tests/manual/simple-shaders-qml/simple-shaders-qml.pro @@ -1,5 +1,5 @@ -!include( ../examples.pri ) { - error( "Couldn't find the examples.pri file!" ) +!include( ../manual.pri ) { + error( "Couldn't find the manual.pri file!" ) } QT += 3dcore 3drender 3dinput 3dquick qml quick 3dquickextras diff --git a/examples/qt3d/simple-shaders-qml/simple-shaders-qml.qrc b/tests/manual/simple-shaders-qml/simple-shaders-qml.qrc index d0469bcb4..d0469bcb4 100644 --- a/examples/qt3d/simple-shaders-qml/simple-shaders-qml.qrc +++ b/tests/manual/simple-shaders-qml/simple-shaders-qml.qrc |