diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2014-12-09 14:57:14 +0100 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2015-01-07 09:17:36 +0100 |
| commit | ff5ba560999703f2d6572a59203ae52d78d221bb (patch) | |
| tree | 970d882f8444e9fbec5694d3fdbff7d322f372ae /tools | |
| parent | 4641376b818dbd05b3303dbae026bdd6bb5a1174 (diff) | |
Remove possible quoting characters
qmake may have quoted already because of certain characters like ~ in
build path
Change-Id: I8a085d23da3da8876f3acd807c9468fc43c7dacb
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmake/mkspecs/features/gyp_generator.prf | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index 5ef3110cc..eea11ef09 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -24,7 +24,7 @@ defineReplace(mocAction) { " 'inputs': ['$$INPUT_FILE',]," \ " 'outputs': ['$$OUTPUT_FILE',]," \ " 'action': [" - for(token, MOC_COMMAND): contents += " '$$token'," + for(token, MOC_COMMAND): contents += " '$$replace(token,\',)'," contents += " '$$INPUT_FILE'," \ " '-o'," \ " '$$OUTPUT_FILE'," \ @@ -39,12 +39,13 @@ defineReplace(rccAction) { OUTPUT_NAME = $$rccOutput($$INPUT_FILE) EXTERN_FUNC = $$rccExternFunc($$INPUT_FILE) OUTPUT_FILE = $$RCC_GEN_DIR/$${OUTPUT_NAME} + CLEAN_QMAKE_RCC = $$clean_path($$QMAKE_RCC) contents = " {" \ " 'action_name':'$$OUTPUT_NAME'," \ " 'inputs': ['$$INPUT_FILE',]," \ " 'outputs': ['$$OUTPUT_FILE',]," \ " 'action': [" \ - " '$$clean_path($$QMAKE_RCC)'," + " '$$replace(CLEAN_QMAKE_RCC,\',)'," for(resource_flag, $$QMAKE_RESOURCE_FLAGS): contents += " '$$resource_flag'," contents += " '-name'," \ " '$$EXTERN_FUNC'," \ |