diff options
Diffstat (limited to 'mkspecs/macx-ios-clang/features/qt.prf')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/qt.prf | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/mkspecs/macx-ios-clang/features/qt.prf b/mkspecs/macx-ios-clang/features/qt.prf index 7ca3198dbe..9e6b486c6e 100644 --- a/mkspecs/macx-ios-clang/features/qt.prf +++ b/mkspecs/macx-ios-clang/features/qt.prf @@ -1,5 +1,6 @@ -equals(TEMPLATE, app):contains(QT, gui(-private)?) { +qt_depends = $$resolve_depends(QT, "QT.") +equals(TEMPLATE, app):contains(qt_depends, gui(-private)?) { LIBS *= -L$$[QT_INSTALL_PLUGINS/get]/platforms lib_name = qios @@ -32,19 +33,20 @@ equals(TEMPLATE, app):contains(QT, gui(-private)?) { # called 'qt_main' now. macx-xcode { - objects_dir = "${OBJECT_FILE_DIR}-${CURRENT_VARIANT}" - archs = "${ARCHS}" + objects_dir = "\"${OBJECT_FILE_DIR}-${CURRENT_VARIANT}\"" + archs = "\"${ARCHS}\"" } else { - objects_dir = $$OBJECTS_DIR - isEmpty(objects_dir): \ + isEmpty(OBJECTS_DIR): \ objects_dir = . - archs = "$$QMAKE_IOS_DEVICE_ARCHS $$QMAKE_IOS_SIMULATOR_ARCHS" + else: \ + objects_dir = $$shell_quote($$OBJECTS_DIR) + archs = $$shell_quote($$QMAKE_IOS_DEVICE_ARCHS $$QMAKE_IOS_SIMULATOR_ARCHS) } !isEmpty(QMAKE_PRE_LINK): \ QMAKE_PRE_LINK += ";" - QMAKE_PRE_LINK += $$QMAKESPEC/rename_main.sh $${objects_dir} \"$${archs}\" + QMAKE_PRE_LINK += $$shell_quote($$QMAKESPEC/rename_main.sh) $$objects_dir $$archs } } |