diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-11-28 14:40:32 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-29 22:47:46 +0100 |
| commit | 3567ea0415b6c32e060a567828161214c867f3c2 (patch) | |
| tree | e286bfd6d9bb2e65db5f6d046cdc08bde4052d6c | |
| parent | 7144e0547640bf33635f6a11e9716f4c4e34b275 (diff) | |
Use $$clean_path
Seems more robust than a regexp, and the right thing to use in this case.
Change-Id: I1ca320606c50fb3d5f593025e23b3e08ae77a124
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | tools/qmake/mkspecs/features/gyp_generator.prf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index ad87f5673..69f0ccaf0 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -32,7 +32,6 @@ defineReplace(mocAction) { } defineReplace(rccAction) { - win32-*: QMAKE_RCC ~= s,\\\\,/,g INPUT_FILE = $$1 OUTPUT_NAME = $$rccOutput($$INPUT_FILE) EXTERN_FUNC = $$rccExternFunc($$INPUT_FILE) @@ -42,7 +41,7 @@ defineReplace(rccAction) { " 'inputs': ['$$INPUT_FILE',]," \ " 'outputs': ['$$OUTPUT_FILE',]," \ " 'action': [" \ - " '$$QMAKE_RCC'," + " '$$clean_path($$QMAKE_RCC)'," for(resource_flag, $$QMAKE_RESOURCE_FLAGS): contents += " '$$resource_flag'," contents += " '-name'," \ " '$$EXTERN_FUNC'," \ |