diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-12-09 10:13:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 10:13:48 +0100 |
| commit | 25b390256bf2a699231a165e49f4100262ed29ac (patch) | |
| tree | 4c3c3cc8dbbe1a523edb26aefd29c22da8732e1f /mkspecs/macx-ios-clang/features/default_post.prf | |
| parent | bcf346a76659f896a25f31aa44f64ba5f28ba8e1 (diff) | |
| parent | f6dbdd9c16166f345fd5743886229192c97c2c4f (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs/macx-ios-clang/features/default_post.prf')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/default_post.prf | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf index 0a35b1167d..8d46f35201 100644 --- a/mkspecs/macx-ios-clang/features/default_post.prf +++ b/mkspecs/macx-ios-clang/features/default_post.prf @@ -173,6 +173,25 @@ macx-xcode { ios_device_family.name = TARGETED_DEVICE_FAMILY ios_device_family.value = $$QMAKE_IOS_TARGETED_DEVICE_FAMILY QMAKE_MAC_XCODE_SETTINGS += ios_device_family + + # Set up default 4-inch iPhone/iPod launch image so that our apps + # support the full screen resolution of those devices. + launch_image = Default-568h@2x.png + copy_image.input = $$QMAKESPEC/$$launch_image + copy_image.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$launch_image + copy_image.CONFIG = verbatim + QMAKE_SUBSTITUTES += copy_image + launch_images.files = $$copy_image.output + QMAKE_BUNDLE_DATA += launch_images + + !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 + # breaks compilation since Qt was built against libstdc++. + QMAKE_CXXFLAGS += -stdlib=libstdc++ + QMAKE_LFLAGS += -stdlib=libstdc++ + } } macx-xcode { |