diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 13:03:09 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-21 13:03:09 +0100 |
| commit | f94ca82e0ff6345648b499911411f2dcc1849267 (patch) | |
| tree | bc5acac8bfecaf5bccc612f5b009bf249bc69ef1 /mkspecs/features/qt.prf | |
| parent | fe29a6a6ebbf28505df7cdf1de24fa540fd3745e (diff) | |
| parent | b1092a7d4240d419cc2b5f3f5c326a1cb680bbdd (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: Ibfcb30053f3aacb8ec2ec480e146538c9bf440ea
Diffstat (limited to 'mkspecs/features/qt.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 5da82fdb5b..d8d5acaafd 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -209,14 +209,6 @@ for(ever) { !isEmpty(MODULE_MODULE) { contains(MODULE_CONFIG, lib_bundle) { framework = $$MODULE_MODULE - 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, - # where if the suffix is specified the framework is first searched - # for the library with the suffix and then without. - framework = $$framework,$$platform_target_suffix - } LIBS$$var_sfx += -framework $$framework } else { !isEmpty(MODULE_LIBS_ADD): \ |