diff options
author | Andy Shaw <andy.shaw@qt.io> | 2019-04-16 08:32:33 +0200 |
---|---|---|
committer | Andy Shaw <andy.shaw@qt.io> | 2020-07-22 00:42:36 +0200 |
commit | 64491c9b72258fb16bf7d9c0eb1877a1b5c1c320 (patch) | |
tree | 5241a8f03083f09502d8f6b3d2fdb3d794825c60 /qmake | |
parent | d25589e0529732996e405aaff8d6c46b012e1601 (diff) |
iOS: Add a variable to customize where the launch image is taken from
For those who are providing their own launch images for their iOS
projects then QMAKE_IOS_LAUNCH_SCREEN can be set to point to the
location where the launch image to be used over the default.
[ChangeLog][Platform Specific Changes][iOS] Added support for
specifying a launch image to be used for an iOS project. This can be
achieved by using QMAKE_IOS_LAUNCH_SCREEN.
Change-Id: Ibb236655b282132ab5eee747986a93abb9802200
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 10 | ||||
-rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 6 | ||||
-rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 7 |
3 files changed, 23 insertions, 0 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 085cd5c461..5d77e74dcf 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -2260,6 +2260,9 @@ \row \li \c ${WATCHOS_DEPLOYMENT_TARGET} \li Expands to the value of QMAKE_WATCHOS_DEPLOYMENT_TARGET. + \row + \li \c ${IOS_LAUNCH_SCREEN} + \li Expands to the value of QMAKE_IOS_LAUNCH_SCREEN. \endtable \note When using the Xcode generator, the above \c{${var}}-style @@ -2283,6 +2286,13 @@ For more information, see \l {Expressing Supported iOS Versions}. + \section1 QMAKE_IOS_LAUNCH_SCREEN + + \note This variable is used on the iOS platform only. + + Specifies the launch screen that is used by the application. If this is not set + then a default launch screen is used. + \section1 QMAKE_LFLAGS Specifies a general set of flags that are passed to diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index c6aab40d85..93b8151c31 100644 --- a/qmake/generators/mac/pbuilder_pbx.cpp +++ b/qmake/generators/mac/pbuilder_pbx.cpp @@ -1615,6 +1615,12 @@ ProjectBuilderMakefileGenerator::writeMakeParts(QTextStream &t) plist_in_text.replace(QLatin1String("@TYPEINFO@"), (project->isEmpty("QMAKE_PKGINFO_TYPEINFO") ? QString::fromLatin1("????") : project->first("QMAKE_PKGINFO_TYPEINFO").left(4).toQString())); + QString launchScreen = var("QMAKE_IOS_LAUNCH_SCREEN"); + if (launchScreen.isEmpty()) + launchScreen = QLatin1String("LaunchScreen"); + else + launchScreen = QFileInfo(launchScreen).baseName(); + plist_in_text.replace(QLatin1String("${IOS_LAUNCH_SCREEN}"), launchScreen); QFile plist_out_file(Option::output_dir + "/Info.plist"); if (plist_out_file.open(QIODevice::WriteOnly | QIODevice::Text)) { QTextStream plist_out(&plist_out_file); diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 48352c0c47..190f5e355a 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -798,6 +798,13 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t) commonSedArgs << "-e \"s,\\$${WATCHOS_DEPLOYMENT_TARGET}," << project->first("QMAKE_WATCHOS_DEPLOYMENT_TARGET").toQString() << ",g\" "; + QString launchScreen = var("QMAKE_IOS_LAUNCH_SCREEN"); + if (launchScreen.isEmpty()) + launchScreen = QLatin1String("LaunchScreen"); + else + launchScreen = QFileInfo(launchScreen).baseName(); + commonSedArgs << "-e \"s,\\$${IOS_LAUNCH_SCREEN}," << launchScreen << ",g\" "; + if (!isFramework) { ProString app_bundle_name = var("QMAKE_APPLICATION_BUNDLE_NAME"); if (app_bundle_name.isEmpty()) |