summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-05-25 15:01:19 +0200
committerJani Heikkinen <jani.heikkinen@qt.io>2016-05-25 15:41:07 +0000
commit61cdc9daca3ca7f9d4f3c7e8fa3b49f89ce02887 (patch)
tree3eebf1ce927a4e05b8c69cb6506199e22418f31b
parent0d4fe94a7ace3b0253e8acaeaa2d449314cfd103 (diff)
Preserve paths with spaces in MOC_COMMAND
This fixes a problem caused by change efd2ea8ea720 in qtbase. MOC_COMMAND now can contain paths with unescaped spaces, like /us/include "/Library/Frameworks (framework directory)" Splitting this just by space will lead to a broken moc call. Change-Id: Ic2875917059141ec82cf5f66243a357ac7ee0ba3 Task-number: QTBUG-53612 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--tools/qmake/mkspecs/features/gyp_generator.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf
index eea11ef0..0ba6de09 100644
--- a/tools/qmake/mkspecs/features/gyp_generator.prf
+++ b/tools/qmake/mkspecs/features/gyp_generator.prf
@@ -17,7 +17,7 @@ defineReplace(mocAction) {
MOC_COMMAND = $$clean_path($$mocCmdBase())
MOC_COMMAND = $$replace(MOC_COMMAND, $$re_escape("$(DEFINES)"), $$DEFINES_LIST)
MOC_COMMAND = $$replace(MOC_COMMAND, $$re_escape("$(INCPATH)"), $$INCPATH)
- MOC_COMMAND = $$split(MOC_COMMAND, " ")
+ MOC_COMMAND = $$eval($$list($$MOC_COMMAND))
OUTPUT_FILE = $$MOC_GEN_DIR/$${OUTPUT_NAME}
contents = " {" \
" 'action_name':'$$OUTPUT_NAME'," \