diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-06-28 08:43:42 +0200 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-06-28 15:44:01 +0000 |
| commit | 030eddd1730f2cb2b175cb02e3848094ad74d22f (patch) | |
| tree | a888465bcc8e1a8006b53b64a69b5ed21fce7bd0 /tests/auto/widgets/kernel/qapplication/modal/modal.pro | |
| parent | 63f78e41dc75656efef9531c438df6356534162d (diff) | |
tst_qapplication: 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: I017b501506c54c4b89773d2b949c097598bc7049
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication/modal/modal.pro')
| -rw-r--r-- | tests/auto/widgets/kernel/qapplication/modal/modal.pro | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/modal/modal.pro b/tests/auto/widgets/kernel/qapplication/modal/modal.pro index a34871d2aa..e832d90821 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/modal.pro +++ b/tests/auto/widgets/kernel/qapplication/modal/modal.pro @@ -1,7 +1,15 @@ QT += widgets SOURCES += main.cpp \ base.cpp -DESTDIR = ./ -CONFIG -= app_bundle debug_and_release_target +debug_and_release { + CONFIG(debug, debug|release) { + TARGET = ../../debug/modal_helper + } else { + TARGET = ../../release/modal_helper + } +} else { + TARGET = ../modal_helper +} +CONFIG -= app_bundle HEADERS += base.h |