diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-19 15:09:24 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2016-10-23 10:39:56 +0000 |
| commit | 7437ede145daeae918cf96a5a9bd10f363d280a2 (patch) | |
| tree | 91c73c860061eebee00937d4fa49ddd90cbd5e3b /mkspecs | |
| parent | 9cac65bc66d8aa329df2c09ba9eedd3f8f08725b (diff) | |
macOS: Don't build auto-tests as application bundles unless explicitly requested
Consistent with other Unix platforms, and internally consistent between tests,
as a lot of tests were already applying CONFIG -= app_bundle manually.
Change-Id: Icd2b7e1c08015b26137af60ff82fddbc753f0ff4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_build_config.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/testcase.prf | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index 95e63ecae0..f543b47351 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -80,6 +80,8 @@ CONFIG += \ # resolved), nor functional (.res files end up in .prl files and break things). unix: CONFIG += explicitlib +# By default we want tests on macOS to be built as standalone executables +macos: CONFIG += testcase_no_bundle defineTest(qtBuildPart) { bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS) diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 64a6a9266b..e42343f434 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -6,6 +6,9 @@ have_target { # qt_build_config tells us to re-enable exceptions here. testcase_exceptions: CONFIG += exceptions +# Set in qt_build_config.prf +testcase_no_bundle: CONFIG -= app_bundle + benchmark: type = benchmark else: type = check |