diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
| commit | 06bd93c4acf49fc24408a60ebdf7a46caf02f9b3 (patch) | |
| tree | eedbdaa40fbf20bb99187084dd9edf14f73f05bd /mkspecs | |
| parent | bafad505a0adb21b819f7617e5e802bf2d52fd54 (diff) | |
| parent | 41a7d74385eece725435159ca021151e871bf116 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/platforms/ios/qiosmessagedialog.mm
Change-Id: Icfbf55c3215ec088e552d0b42a5c94d04b17c65f
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 7b669b902f..e58e452620 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -203,10 +203,10 @@ contains(qt_module_deps, qml): \ # run qmlimportscanner qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system) for (QMLPATH, QMLPATHS): \ - IMPORTPATHS += -importPath $$QMLPATH + IMPORTPATHS += -importPath $$system_quote($$QMLPATH) #message(run $$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) - JSON = $$system($$QMLIMPORTSCANNER $$_PRO_FILE_PWD_ $$IMPORTPATHS) + JSON = $$system($$QMLIMPORTSCANNER $$system_quote($$_PRO_FILE_PWD_) $$IMPORTPATHS) parseJson(JSON, IMPORTS)| error("Failed to parse qmlimportscanner output.") @@ -267,13 +267,13 @@ contains(qt_module_deps, qml): \ # But strip away archives and other files that are not needed: !isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += ";" QMAKE_POST_LINK += \ - "cp $$OUT_PWD/qt.conf $$qtconfTargetPath; " \ - "test -d $$qmlTargetPath && rm -r $$qmlTargetPath; " \ - "mkdir -p $$qmlTargetPath && " \ + "cp $$shell_quote($$OUT_PWD/qt.conf) \"$$qtconfTargetPath\"; " \ + "test -d \"$$qmlTargetPath\" && rm -r \"$$qmlTargetPath\"; " \ + "mkdir -p \"$$qmlTargetPath\" && " \ "for p in $$QMLPATHS; do" \ "rsync -r --exclude='*.a' --exclude='*.prl' --exclude='*.qmltypes' " - macx-xcode: QMAKE_POST_LINK += "$p/ $$qmlTargetPath; done" - else: QMAKE_POST_LINK += "\$\$p/ $$qmlTargetPath; done" + macx-xcode: QMAKE_POST_LINK += "$p/ \"$$qmlTargetPath\"; done" + else: QMAKE_POST_LINK += "\$\$p/ \"$$qmlTargetPath\"; done" } } } |