diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-10-25 17:00:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-25 20:50:51 +0200 |
| commit | 25650923b10bfd9a5f6b7c05c365eeb602023357 (patch) | |
| tree | 0a70a5138dda52ea96650654f8deb993baccf0f6 | |
| parent | 054f357b695cfb2ef4a3c20e2bb617f23a00172a (diff) | |
xcode: Set QMAKE_XCODE_LIBRARY_SUFFIX from default_post
Otherwise we won't pick up CONFIG+= changes on the command line or
from the project file.
Change-Id: I6f7e9380f971e6271de5659534e9565024fe041d
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/mac/default_pre.prf | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index b183814e63..5d0fdb092f 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -27,6 +27,8 @@ isEmpty(_QMAKE_CACHE_) { cache(QMAKE_XCODE_VERSION) } +QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() + # Ensure that we process sdk.prf first, as it will update QMAKE_CXX # and friends that other features/extra compilers may depend on. sdk: load(sdk) diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf index c0596d5ef0..98caf54f8a 100644 --- a/mkspecs/features/mac/default_pre.prf +++ b/mkspecs/features/mac/default_pre.prf @@ -24,8 +24,7 @@ isEmpty(QMAKE_XCODE_VERSION) { unset(xcode_version) } -# These two variables are used by the xcode_dynamic_library_suffix +# This variable is used by the xcode_dynamic_library_suffix # feature, which allows Xcode to choose the Qt libraries to link to # at build time, depending on the current Xcode SDK and configuration. -QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX |