summaryrefslogtreecommitdiff
path: root/qmake-features
diff options
context:
space:
mode:
authorRobert Griebl <robert.griebl@pelagicore.com>2019-08-07 12:09:43 +0200
committerRobert Griebl <robert.griebl@qt.io>2019-10-28 14:11:37 +0100
commit0a1cccfccd8f76014bc697c5c9006c5ebb9723e8 (patch)
tree250203807b296f32ffbebae798d48316113a51d8 /qmake-features
parent0120c4c892c3765fba18b15e3a28d446bf1a3f38 (diff)
downloadqtapplicationmanager-0a1cccfccd8f76014bc697c5c9006c5ebb9723e8.tar.gz
Add new package abstraction, part 2
The first commit in this series was b4aee167d3bc6b9f64229317fbc428b3f3b83c0d. This update fixes all the known bugs introduced in the change of the architecture, adds basic documentation and examples. The changes in the intent sub-system are in a separate patch for easier review, although they both depend on each other due to changes in the API. Change-Id: Ia78da7e10e2eb7adfa30625554af275453065a90 Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'qmake-features')
-rw-r--r--qmake-features/am-qml-testcase.prf5
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake-features/am-qml-testcase.prf b/qmake-features/am-qml-testcase.prf
index 923920fe..6958f1bc 100644
--- a/qmake-features/am-qml-testcase.prf
+++ b/qmake-features/am-qml-testcase.prf
@@ -60,6 +60,11 @@ for(config, AM_CONFIG) {
}
OTHER_FILES += $$AM_CONFIG
+# Make AM_TESTDATA_DIR known
+!isEmpty(AM_TESTDATA_DIR) {
+ COMMAND += -o \'systemProperties: { public: { AM_TESTDATA_DIR: $$AM_TESTDATA_DIR } }\'
+}
+
!isEmpty(TESTRUN_CWD):!contains(TESTRUN_CWD, ^\\./?): \
COMMAND = cd $$shell_path($$TESTRUN_CWD) && $$eval(COMMAND)