From c1506d9cf6b706c87b4e09800f410219e0e7cdec Mon Sep 17 00:00:00 2001 From: Zoltan Arvai Date: Mon, 18 Nov 2013 16:04:08 +0100 Subject: Fix Qt rcc's path in Qt5WebEngineCore.ninja on Windows. On Windows backslash in QMAKE_RCC causes wrongly generated Qt5WebEngineCore.ninja file. For example QMAKE_RCC's value generated to lib/lib.gyp as 'c:\Qt-5.2.0\bin\rcc.exe'. This turns to 'c:/Qt-5.2.0[BS]in[CR]cc.exe' in Qt5WebEngineCore.ninja after running qyp. That means \b is parsed as backspace and \r is pharsed as carriage return character. Current Windows versions can handle forward slashes in paths so backslashes can be replaced to forward slashes when needed. Change-Id: I814dc63df92b78ed5cae028e0b8c36dbf3eb1e49 Reviewed-by: Andras Becsi Reviewed-by: Pierre Rossi --- build/qmake/mkspecs/features/gyp_generator.prf | 1 + 1 file changed, 1 insertion(+) (limited to 'build') diff --git a/build/qmake/mkspecs/features/gyp_generator.prf b/build/qmake/mkspecs/features/gyp_generator.prf index 768fe43d4..5288e7c19 100644 --- a/build/qmake/mkspecs/features/gyp_generator.prf +++ b/build/qmake/mkspecs/features/gyp_generator.prf @@ -32,6 +32,7 @@ defineReplace(mocAction) { } defineReplace(rccAction) { + win32-*: QMAKE_RCC ~= s,\\\\,/,g INPUT_FILE = $$1 OUTPUT_NAME = $$rccOutput($$INPUT_FILE) EXTERN_FUNC = $$rccExternFunc($$INPUT_FILE) -- cgit v1.2.3