Commit ff5ba560 authored by Stephan Binner's avatar Stephan Binner
Browse files

Remove possible quoting characters


qmake may have quoted already because of certain characters like ~ in
build path

Change-Id: I8a085d23da3da8876f3acd807c9468fc43c7dacb
Reviewed-by: default avatarJocelyn Turcotte <jocelyn.turcotte@digia.com>
Showing with 3 additions and 2 deletions
...@@ -24,7 +24,7 @@ defineReplace(mocAction) { ...@@ -24,7 +24,7 @@ defineReplace(mocAction) {
" 'inputs': ['$$INPUT_FILE',]," \ " 'inputs': ['$$INPUT_FILE',]," \
" 'outputs': ['$$OUTPUT_FILE',]," \ " 'outputs': ['$$OUTPUT_FILE',]," \
" 'action': [" " 'action': ["
for(token, MOC_COMMAND): contents += " '$$token'," for(token, MOC_COMMAND): contents += " '$$replace(token,\',)',"
contents += " '$$INPUT_FILE'," \ contents += " '$$INPUT_FILE'," \
" '-o'," \ " '-o'," \
" '$$OUTPUT_FILE'," \ " '$$OUTPUT_FILE'," \
...@@ -39,12 +39,13 @@ defineReplace(rccAction) { ...@@ -39,12 +39,13 @@ defineReplace(rccAction) {
OUTPUT_NAME = $$rccOutput($$INPUT_FILE) OUTPUT_NAME = $$rccOutput($$INPUT_FILE)
EXTERN_FUNC = $$rccExternFunc($$INPUT_FILE) EXTERN_FUNC = $$rccExternFunc($$INPUT_FILE)
OUTPUT_FILE = $$RCC_GEN_DIR/$${OUTPUT_NAME} OUTPUT_FILE = $$RCC_GEN_DIR/$${OUTPUT_NAME}
CLEAN_QMAKE_RCC = $$clean_path($$QMAKE_RCC)
contents = " {" \ contents = " {" \
" 'action_name':'$$OUTPUT_NAME'," \ " 'action_name':'$$OUTPUT_NAME'," \
" 'inputs': ['$$INPUT_FILE',]," \ " 'inputs': ['$$INPUT_FILE',]," \
" 'outputs': ['$$OUTPUT_FILE',]," \ " 'outputs': ['$$OUTPUT_FILE',]," \
" 'action': [" \ " 'action': [" \
" '$$clean_path($$QMAKE_RCC)'," " '$$replace(CLEAN_QMAKE_RCC,\',)',"
for(resource_flag, $$QMAKE_RESOURCE_FLAGS): contents += " '$$resource_flag'," for(resource_flag, $$QMAKE_RESOURCE_FLAGS): contents += " '$$resource_flag',"
contents += " '-name'," \ contents += " '-name'," \
" '$$EXTERN_FUNC'," \ " '$$EXTERN_FUNC'," \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment