diff options
author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2014-01-22 09:01:24 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 11:13:06 +0100 |
commit | 2a976806a8c02209fc2c7f1b365afd85ce2f31b2 (patch) | |
tree | 428266b4db63568b9325fbda23e790f0499fb9da /tools/qmake | |
parent | 6f07e22acf15651f91d326529519119af7e807a9 (diff) |
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 <michael.bruning@digia.com>
Diffstat (limited to 'tools/qmake')
-rw-r--r-- | tools/qmake/mkspecs/features/gyp_generator.prf | 2 |
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 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, " ") |