diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-09-26 17:00:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-27 12:43:17 +0200 |
| commit | d5c729604a18dc0505189d570a5d4baaa4ebaf43 (patch) | |
| tree | 54e195bde9dce344574aa571396ac5310f955aaf /mkspecs | |
| parent | bdfbc9e493b4df7da89fb62222dc7cb283b3794a (diff) | |
iOS: Always use application bundle when building Qt applications
Change-Id: I8fd0f7b43bdcbff0bff2de890fe421eb51233192
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/ios/default_post.prf | 11 | ||||
| -rw-r--r-- | mkspecs/features/ios/qt.prf | 3 |
2 files changed, 13 insertions, 1 deletions
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 |