diff options
| -rw-r--r-- | mkspecs/common/ios.conf | 6 | ||||
| -rw-r--r-- | mkspecs/features/ios/default_post.prf | 13 | ||||
| -rw-r--r-- | mkspecs/features/ios/default_pre.prf | 4 |
3 files changed, 20 insertions, 3 deletions
diff --git a/mkspecs/common/ios.conf b/mkspecs/common/ios.conf index 0d68d37ff8..4c1c1f093d 100644 --- a/mkspecs/common/ios.conf +++ b/mkspecs/common/ios.conf @@ -3,11 +3,11 @@ # MAKEFILE_GENERATOR = UNIX -CONFIG += ios reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname sdk +CONFIG += app_bundle reduce_exports incremental global_init_link_order lib_version_first plugin_no_soname sdk QMAKE_INCREMENTAL_STYLE = sublib -# Qt can't build iOS app bundle :( -CONFIG -= app_bundle +# FIXME: Transform ios.conf to follow the same inheritance pattern as eg mac.conf and unix.conf +QMAKE_PLATFORM = ios $$QMAKE_PLATFORM # Not deploying to Mac OSX QMAKE_MACOSX_DEPLOYMENT_TARGET = diff --git a/mkspecs/features/ios/default_post.prf b/mkspecs/features/ios/default_post.prf new file mode 100644 index 0000000000..3e9d12be3b --- /dev/null +++ b/mkspecs/features/ios/default_post.prf @@ -0,0 +1,13 @@ + +CONFIG(qt):contains(QT, gui):equals(TEMPLATE, app): CONFIG += gui_app + +isEmpty(MAKEFILE_GENERATOR) { + gui_app:app_bundle: \ + # For applications we want Xcode project files + MAKEFILE_GENERATOR = XCODE + else: \ + # For libs, etc we still want regular Makefiles + MAKEFILE_GENERATOR = UNIX +} + +load(default_post) diff --git a/mkspecs/features/ios/default_pre.prf b/mkspecs/features/ios/default_pre.prf new file mode 100644 index 0000000000..e2956bd77d --- /dev/null +++ b/mkspecs/features/ios/default_pre.prf @@ -0,0 +1,4 @@ +# Unset makefile generator, so we can auto-detect value in default_post +unset(MAKEFILE_GENERATOR) + +load(default_pre) |