diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-06-28 08:21:53 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-06-28 15:44:00 +0000 |
| commit | 63f78e41dc75656efef9531c438df6356534162d (patch) | |
| tree | 544c0f60274e9df4ab8581cceda5104957979849 /tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro | |
| parent | 8f143c75f0d14e75977443029938ee63a7aeab0f (diff) | |
tst_qthreadstorage: Fix execution for WinRT
Not putting executables into debug/release subdirectories leads to the
WinRT AppxManifest being overwritten by the wrong configuration. When Qt
is configured with -release for example, it was possible that the debug
manifest (Manifest files are always created next to the target) is
written last and thus contains debug VCLibs as a dependency.
Additionally the test was changed in that way, that the resulting file
system structure (having helper and test application in a "top level"
debug and release folder) is the same structure as in tst_qobject.
Change-Id: I53d5238ff36706eb9c6f8eb04b954ec595ca30de
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro')
| -rw-r--r-- | tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro index 94a0a01e94..d5c09ebc84 100644 --- a/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro +++ b/tests/auto/corelib/thread/qthreadstorage/crashonexit/crashonexit.pro @@ -1,5 +1,13 @@ SOURCES += crashOnExit.cpp -DESTDIR = ./ +debug_and_release { + CONFIG(debug, debug|release) { + TARGET = ../../debug/crashOnExit_helper + } else { + TARGET = ../../release/crashOnExit_helper + } +} else { + TARGET = ../crashOnExit_helper +} QT = core CONFIG -= app_bundle CONFIG += console |