From 2a976806a8c02209fc2c7f1b365afd85ce2f31b2 Mon Sep 17 00:00:00 2001 From: Zoltan Arvai Date: Wed, 22 Jan 2014 09:01:24 +0100 Subject: Fix Qt's moc path on Windows Backslash from mocCmdBase is processed as an escape sequence in generated gyp file. E.g. Qt5\bin\moc.exe turns to Qt5[BS]in\moc.exe. Change-Id: I09a04b0e168e1139720c44307f192f7a9368ad43 Reviewed-by: Michael Bruning --- tools/qmake/mkspecs/features/gyp_generator.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index b1dcac19f..20cde1d6d 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -11,7 +11,7 @@ defineReplace(mocAction) { OUTPUT_NAME = $$mocOutput($$INPUT_FILE) DEFINES_LIST = $$join(DEFINES, " -D", -D) INCPATH = $$join(INCLUDEPATH, " -I", -I) - MOC_COMMAND = $$mocCmdBase() + 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, " ") -- cgit v1.2.3