diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2015-08-09 07:06:52 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-09 07:06:52 +0000 |
| commit | 5bfac9d653357c906946563b9494d7ae69cdad92 (patch) | |
| tree | 0cc119af894a398497eba6f56fe2f224f6947616 /mkspecs | |
| parent | f08e1ecdc88e9373a31c1505d5db7f905431c644 (diff) | |
| parent | 77da617dc8e378a631ee8c15b1b414f16b87f147 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/msvc-desktop.conf | 2 | ||||
| -rw-r--r-- | mkspecs/macx-ios-clang/features/default_post.prf | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf index e1abca46e4..72e0b98c9c 100644 --- a/mkspecs/common/msvc-desktop.conf +++ b/mkspecs/common/msvc-desktop.conf @@ -141,7 +141,7 @@ greaterThan(MSC_VER, 1899) { QMAKE_CFLAGS_WARN_ON += -w44456 -w44457 -w44458 QMAKE_CFLAGS_AVX2 = -arch:AVX2 QMAKE_CXXFLAGS += -Zc:strictStrings - QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 + QMAKE_CXXFLAGS_WARN_ON += -w44456 -w44457 -w44458 -wd4577 } unset(MSC_VER) diff --git a/mkspecs/macx-ios-clang/features/default_post.prf b/mkspecs/macx-ios-clang/features/default_post.prf index 3acd35a038..5266c88f16 100644 --- a/mkspecs/macx-ios-clang/features/default_post.prf +++ b/mkspecs/macx-ios-clang/features/default_post.prf @@ -41,24 +41,24 @@ macx-xcode { # 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 + qmake_launch_image = Default-568h@2x.png + qmake_copy_image.input = $$QMAKESPEC/$$qmake_launch_image + qmake_copy_image.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$qmake_launch_image + qmake_copy_image.CONFIG = verbatim + QMAKE_SUBSTITUTES += qmake_copy_image + qmake_launch_images.files = $$qmake_copy_image.output + QMAKE_BUNDLE_DATA += qmake_launch_images lessThan(QMAKE_XCODE_VERSION, "6.0") { warning("You need to update Xcode to version 6 or newer to fully support iPhone6/6+") } else { # Set up default LaunchScreen to support iPhone6/6+ - launch_screen = LaunchScreen.xib - copy_launch_screen.input = $$QMAKESPEC/$$launch_screen - copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$launch_screen - QMAKE_SUBSTITUTES += copy_launch_screen - launch_screens.files = $$copy_launch_screen.output - QMAKE_BUNDLE_DATA += launch_screens + qmake_launch_screen = LaunchScreen.xib + qmake_copy_launch_screen.input = $$QMAKESPEC/$$qmake_launch_screen + qmake_copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$qmake_launch_screen + QMAKE_SUBSTITUTES += qmake_copy_launch_screen + qmake_launch_screens.files = $$qmake_copy_launch_screen.output + QMAKE_BUNDLE_DATA += qmake_launch_screens } } |