Revert "Fix shared library framework builds of Qt with a platform suffix."
This reverts commit c4ecb81d6d.
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>
bb10
parent
bfeb2fdd79
commit
d6c8073a34
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue