diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:42:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-10-04 00:44:18 +0200 |
| commit | d8fc0da235b2bd566b2b6f1e21218afdf2f34eb3 (patch) | |
| tree | c0ca819521ed6901a83ab476fa822a886691d806 /mkspecs | |
| parent | 3649a6e61d823289d18be19387d7e3923dd90bd0 (diff) | |
| parent | cdf0c5905b3477c6cd01c519f883b7bb55447120 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/minimal/qminimalintegration.cpp
src/plugins/platforms/offscreen/qoffscreenintegration.cpp
Change-Id: Ica85deeab5c5038ac004718e25194b1157343480
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/android/android.prf (renamed from mkspecs/features/android.prf) | 0 | ||||
| -rw-r--r-- | mkspecs/features/android/android_deployment_settings.prf (renamed from mkspecs/features/android_deployment_settings.prf) | 0 | ||||
| -rw-r--r-- | mkspecs/features/ios/default_post.prf | 11 | ||||
| -rw-r--r-- | mkspecs/features/ios/qt.prf | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/mkspecs/features/android.prf b/mkspecs/features/android/android.prf index 5e21f0b845..5e21f0b845 100644 --- a/mkspecs/features/android.prf +++ b/mkspecs/features/android/android.prf diff --git a/mkspecs/features/android_deployment_settings.prf b/mkspecs/features/android/android_deployment_settings.prf index 1e54b67789..1e54b67789 100644 --- a/mkspecs/features/android_deployment_settings.prf +++ b/mkspecs/features/android/android_deployment_settings.prf diff --git a/mkspecs/features/ios/default_post.prf b/mkspecs/features/ios/default_post.prf index 3322047788..a61db3daea 100644 --- a/mkspecs/features/ios/default_post.prf +++ b/mkspecs/features/ios/default_post.prf @@ -1,6 +1,15 @@ equals(TEMPLATE, app) { - qt:app_bundle:!macx-xcode { + + # If the application uses Qt, it needs to be an application bundle + # to be able to deploy and run on iOS. The only exception to this + # is if you're working with a jailbroken device and can run the + # resulting binary from the console/over SSH, but that's not a + # use-case we care about, so no need to complicate the logic. + qt: CONFIG *= app_bundle + + # Application bundles require building through Xcode + app_bundle:!macx-xcode { # For Qt applications we want Xcode project files as the generated output, # but since qmake doesn't handle the transition between makefiles and Xcode # project files (which happens when using subdirs), we create a wrapper diff --git a/mkspecs/features/ios/qt.prf b/mkspecs/features/ios/qt.prf index 79bc9a8f46..9fa882c99f 100644 --- a/mkspecs/features/ios/qt.prf +++ b/mkspecs/features/ios/qt.prf @@ -1,5 +1,8 @@ equals(TEMPLATE, app):contains(QT, gui(-private)?) { + !macx-xcode: \ + error("Linking the iOS platform plugin requires bulding through Xcode") + LIBS *= -L$$[QT_INSTALL_PLUGINS/get]/platforms lib_name = qios |