AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: ensure we don't overwrite a projects qmake variables

Browse Source 
Consider a project that does the following:

launch_images.files = $$PWD/LaunchImage.xib
QMAKE_BUNDLE_DATA += launch_images

In that case we end up overwriting launch_images.files in default_post, and
at the same time, add launch_images a second time to QMAKE_BUNDLE_DATA.
The result will be that we copy our own launch image twize into the bundle.

To prevent this, prepend our internal variables with qmake_

Change-Id: I24f870874017b5388248e3bfadecd461422ffe35
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
This commit is contained in:
Richard Moe Gustavsen 2015-07-27 15:27:07 +02:00
parent 56a4a34eb3
commit 8d6ef359c8
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mkspecs/macx-ios-clang/features/default_post.prf
View File

@ -196,24 +196,24 @@ macx-xcode {
# Set up default 4-inch iPhone/iPod launch image so that our apps # Set up default 4-inch iPhone/iPod launch image so that our apps
# support the full screen resolution of those devices. # support the full screen resolution of those devices.
launch_image = Default-568h@2x.png qmake_launch_image = Default-568h@2x.png
copy_image.input = $$QMAKESPEC/$$launch_image qmake_copy_image.input = $$QMAKESPEC/$$qmake_launch_image
copy_image.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$launch_image qmake_copy_image.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$qmake_launch_image
copy_image.CONFIG = verbatim qmake_copy_image.CONFIG = verbatim
QMAKE_SUBSTITUTES += copy_image QMAKE_SUBSTITUTES += qmake_copy_image
launch_images.files = $$copy_image.output qmake_launch_images.files = $$qmake_copy_image.output
QMAKE_BUNDLE_DATA += launch_images QMAKE_BUNDLE_DATA += qmake_launch_images
lessThan(QMAKE_XCODE_VERSION, "6.0") { lessThan(QMAKE_XCODE_VERSION, "6.0") {
warning("You need to update Xcode to version 6 or newer to fully support iPhone6/6+") warning("You need to update Xcode to version 6 or newer to fully support iPhone6/6+")
} else { } else {
# Set up default LaunchScreen to support iPhone6/6+ # Set up default LaunchScreen to support iPhone6/6+
launch_screen = LaunchScreen.xib qmake_launch_screen = LaunchScreen.xib
copy_launch_screen.input = $$QMAKESPEC/$$launch_screen qmake_copy_launch_screen.input = $$QMAKESPEC/$$qmake_launch_screen
copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$launch_screen qmake_copy_launch_screen.output = $$OUT_PWD/$${TARGET}.xcodeproj/$$qmake_launch_screen
QMAKE_SUBSTITUTES += copy_launch_screen QMAKE_SUBSTITUTES += qmake_copy_launch_screen
launch_screens.files = $$copy_launch_screen.output qmake_launch_screens.files = $$qmake_copy_launch_screen.output
QMAKE_BUNDLE_DATA += launch_screens QMAKE_BUNDLE_DATA += qmake_launch_screens
} }
} }