diff options
| author | Zoltan Arvai <zarvai@inf.u-szeged.hu> | 2013-11-18 16:04:08 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-19 15:53:09 +0100 |
| commit | c1506d9cf6b706c87b4e09800f410219e0e7cdec (patch) | |
| tree | feb046d40d80e7f68638521689bc0722c79cea15 | |
| parent | 6c1eee1342364741a57154683450a941c2f5983f (diff) | |
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 <andras.becsi@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| -rw-r--r-- | build/qmake/mkspecs/features/gyp_generator.prf | 1 |
1 files changed, 1 insertions, 0 deletions
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) |