diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-02-19 12:02:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-02-19 12:02:49 +0100 |
| commit | bcc965ef4bae2565456522b19687a3e726da8315 (patch) | |
| tree | 905c4228ed9e5a15ad818e90a5ad665271d7698a /mkspecs | |
| parent | d40aca0840ca998636f8bdbc217f2a0a5f89c2a6 (diff) | |
| parent | 9b49b375e3d753fa3cd8166da266724a85cfe389 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I7bee7df50af3d607a349b68103cd2c67791281fb
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/mac/sdk.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 10 |
3 files changed, 2 insertions, 12 deletions
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf index 46ed51deb4..ab37b1740f 100644 --- a/mkspecs/features/mac/sdk.prf +++ b/mkspecs/features/mac/sdk.prf @@ -17,7 +17,7 @@ defineReplace(xcodeSDKInfo) { cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) } - return($$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.$${info})) + return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) } QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) 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 0046cce9ad..2756f90b01 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -14,16 +14,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) { |