diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:18:01 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-05 09:18:01 +0100 |
| commit | aec026fe1ef8ff62a6138cc49040dd82d815d3ce (patch) | |
| tree | 6d8e53a2af0a61327b16f954dc343c6ee8aa8596 /mkspecs | |
| parent | b82559244e2dc03f1ceff66bb67630df4300dc7c (diff) | |
| parent | 13ed06640c6cf32ea8c784c896c6bf017053edb3 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: I54b4c14bed5150d3034ac87907a09254fd78face
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/testcase.prf | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 90e318e2a4..d16b3cf1be 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -231,7 +231,7 @@ for(ever) { !isEmpty(MODULE_MODULE) { contains(MODULE_CONFIG, lib_bundle) { framework = $$MODULE_MODULE - qtConfig(debug_and_release):!macx-xcode { + qtConfig(debug_and_release):qt_link_suffixed_framework:!macx-xcode { platform_target_suffix = $$qtPlatformTargetSuffix() !isEmpty(platform_target_suffix): \ # The -framework linker argument supports a name[,suffix] version, diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 79883b7f09..bfc28c6861 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -21,6 +21,9 @@ testcase_lowdpi { } } +# Make sure we explicitly link to the debug version of the Qt libraries if needed +macos: CONFIG += qt_link_suffixed_framework + benchmark: type = benchmark else: type = check |