diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-02-15 19:41:20 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2016-02-17 13:06:45 +0000 |
| commit | d6c8073a34e77f8a1afbca913df86f7e70ee9f74 (patch) | |
| tree | bbd3cb297e84a8c1c85fee77caaf76fcfc954271 | |
| parent | bfeb2fdd7999e63fd21045eb7c0ac5dc5e62d726 (diff) | |
Revert "Fix shared library framework builds of Qt with a platform suffix."
This reverts commit c4ecb81d6d64a190f7d24222d8cf35d953e73c1e.
Hard-coding the library suffix into the linker flags was wrong. The
library suffix is handled at runtime with DYLD_IMAGE_SUFFIX, set
as part of the Xcode scheme or during debugging in .lldbinit.
Change-Id: I11907b2755f7f187fb6fa18202813fde9ada4354
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index b53617ba2a..4b40451c96 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -122,7 +122,7 @@ for(ever) { QMAKE_FRAMEWORKPATH *= $$MODULE_FRAMEWORKS !isEmpty(MODULE_MODULE) { contains(MODULE_CONFIG, lib_bundle) { - LIBS$$var_sfx += -framework $${MODULE_MODULE}$$qtFrameworkPlatformTargetSuffix() + LIBS$$var_sfx += -framework $$MODULE_MODULE } else { !isEmpty(MODULE_LIBS_ADD): \ LIBS$$var_sfx += -L$$MODULE_LIBS_ADD diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 88467e89ba..b2c2507807 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -13,16 +13,6 @@ defineReplace(qtPlatformTargetSuffix) { return($$suffix) } -# suffix for the -framework linker flag when the exectuable's name -# differs from the bundle's, for example -framework QtCore,_debug -# links to QtCore.framework/QtCore_debug -defineReplace(qtFrameworkPlatformTargetSuffix) { - suffix = $$qtPlatformTargetSuffix() - !isEmpty(suffix): \ - suffix = ,$$suffix - return($$suffix) -} - defineReplace(qtLibraryTarget) { LIBRARY_NAME = $$1 CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { |