From 61cdc9daca3ca7f9d4f3c7e8fa3b49f89ce02887 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 25 May 2016 15:01:19 +0200 Subject: 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 --- tools/qmake/mkspecs/features/gyp_generator.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index eea11ef09..0ba6de09c 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'," \ -- cgit v1.2.3