From d6c8073a34e77f8a1afbca913df86f7e70ee9f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 15 Feb 2016 19:41:20 +0100 Subject: [PATCH] Revert "Fix shared library framework builds of Qt with a platform suffix." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Oswald Buddenhagen Reviewed-by: Tor Arne Vestbø --- mkspecs/features/qt.prf | 2 +- mkspecs/features/qt_functions.prf | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index b53617ba2a2..4b40451c966 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 88467e89bad..b2c25078071 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) {