diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-20 11:56:01 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-03-27 13:29:59 +0000 |
| commit | f702d5c3270c4845f19a4e8ed7b58f00aaa47fe7 (patch) | |
| tree | 5906f185877244c3454222416c0bba54255fc451 /mkspecs/macx-ios-clang/features/qt.prf | |
| parent | 81dfba6ae93b830f176b3bbefda6866a431baa27 (diff) | |
fix quoting problems in ios main() renamer
Task-number: QTBUG-45125
Change-Id: I6fc724509e25a43bb229715f7e486bf9c3553f53
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'mkspecs/macx-ios-clang/features/qt.prf')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/qt.prf | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mkspecs/macx-ios-clang/features/qt.prf b/mkspecs/macx-ios-clang/features/qt.prf index 697eb0ed60..9e6b486c6e 100644 --- a/mkspecs/macx-ios-clang/features/qt.prf +++ b/mkspecs/macx-ios-clang/features/qt.prf @@ -33,19 +33,20 @@ equals(TEMPLATE, app):contains(qt_depends, 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 } } |