aboutsummaryrefslogtreecommitdiffstats
path: root/examples/qmltest
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-01-24 18:32:19 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-28 07:10:03 +0100
commit6c18353123f22c1279258f8ccbd7c45c98bd0980 (patch)
treef82c69697848998503cb86896d12d1116b98e448 /examples/qmltest
parent6bffd4b52ddf1d5040936cc2f387b7dc99ad0cfc (diff)
fix installation of qmltestcase example
split the project along the built-as-part-of-qt line: in qt, it must comply with the installation rules for examples, and it shouldn't be an actual test case - our CI is not supposed to run it ... the stand-alone build (which users are supposed to make use of) needed adding TESTDATA for proper installation. Change-Id: I1bbf7b1204410c5eb8755477310bb023e8f87623 Reviewed-by: Alan Alpert <aalpert@rim.com>
Diffstat (limited to 'examples/qmltest')
-rw-r--r--examples/qmltest/qmltest/qmltest.pro21
1 files changed, 18 insertions, 3 deletions
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro
index 3ade5f2cbd..f290fd21e1 100644
--- a/examples/qmltest/qmltest/qmltest.pro
+++ b/examples/qmltest/qmltest/qmltest.pro
@@ -1,11 +1,26 @@
TEMPLATE=app
TARGET=tst_qmltestexample
-CONFIG += qmltestcase
+
SOURCES += tst_qmltest.cpp
-# Note: Normally, tests are auto-installed to a test-specific directory. Overwritten here
-# so this one will end up in the examples tree.
+!QTDIR_build {
+# This is the code actual testcases should use:
+
+CONFIG += qmltestcase
+
+TESTDATA += tst_basic.qml tst_item.qml
+
+} else {
+# This code exists solely for the purpose of building this example
+# inside the examples/ hierarchy.
+
+QT += qml qmltest
+
+macx: CONFIG -= app_bundle
+
target.path = $$[QT_INSTALL_EXAMPLES]/qmltest
qml.files = tst_basic.qml tst_item.qml
qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest
INSTALLS += target qml
+
+}