diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:21:52 +0100 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-31 15:23:09 +0100 |
commit | 49651307807fc097d14ae13fb71013e46944eb2a (patch) | |
tree | 3bc227a47f42c2edb7ff4b69fc183b4a99fe0bf3 /examples/qmltest | |
parent | 15b232bf694fedf553abac09af077a58ce571f9d (diff) | |
parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) |
Merge branch 'release' into stable
Change-Id: Ic270f7814489b2c7df7e0f1ecb46cd516802cac5
Diffstat (limited to 'examples/qmltest')
-rw-r--r-- | examples/qmltest/qmltest/qmltest.pro | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/examples/qmltest/qmltest/qmltest.pro b/examples/qmltest/qmltest/qmltest.pro index 3ade5f2cbd..b5893c5a1e 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. -target.path = $$[QT_INSTALL_EXAMPLES]/qmltest +!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/qmltest qml.files = tst_basic.qml tst_item.qml -qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest +qml.path = $$[QT_INSTALL_EXAMPLES]/qmltest/qmltest INSTALLS += target qml + +} |