diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-16 08:54:58 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-16 08:54:58 +0100 |
| commit | 942ab490724fcc9544e786e5783718e1a07aa50b (patch) | |
| tree | feb7d3ff716edb37b2ca60e33c05adf8777bd964 /mkspecs/features/testcase.prf | |
| parent | 0fb8271a467202990c90321066e40faed640a7a8 (diff) | |
| parent | 24adaa9a742e6f95ff897d0eb9a2bce0527dd042 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/corelib/tools/tools.pri
Change-Id: I705630f9cecbf0ce51a22fc6116b8c49611259e9
Diffstat (limited to 'mkspecs/features/testcase.prf')
| -rw-r--r-- | mkspecs/features/testcase.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 3e1537dde0..8d51c9d028 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -44,7 +44,7 @@ unix { $${type}.commands += $${TEST_TARGET_DIR}/$(QMAKE_TARGET) } else { # Windows - !isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = $${TEST_TARGET_DIR}$${QMAKE_DIR_SEP} + !isEmpty(TEST_TARGET_DIR): TEST_TARGET_DIR = $$shell_path($$TEST_TARGET_DIR)$${QMAKE_DIR_SEP} $${type}.commands += $${TEST_TARGET_DIR}$(TARGET) } |