diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-01-16 13:47:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 21:51:36 +0100 |
| commit | 0cd776f2cdeebb6b8d2cd5d17be7a1d561708ef3 (patch) | |
| tree | 958b56f17a3e1e580c06f93bb4bb5fc0e4081cd1 /mkspecs/macx-ios-clang | |
| parent | d6d7624796471b8296fdfa6492b0570bd78e1d93 (diff) | |
iOS: Prevent trying to use both libc++ and libstdc++
Static builds of Qt will automatically enable C++11 for all projects,
but this happens in mac/default_post which is after our check.
Change-Id: I22a01e5d876242263fa31f8a404a65905c6c1877
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'mkspecs/macx-ios-clang')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/default_post.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf index 3428823624..09e1951be0 100644 --- a/mkspecs/macx-ios-clang/features/default_post.prf +++ b/mkspecs/macx-ios-clang/features/default_post.prf @@ -184,7 +184,7 @@ macx-xcode { launch_images.files = $$copy_image.output QMAKE_BUNDLE_DATA += launch_images - !c++11 { + !contains(QT_CONFIG, c++11) { # Explicitly use libstdc++ if C++11 support is not enabled, # as otherwise Xcode will choose the compiler default based # on the deployment target, which for iOS 7 is libc++. This |