AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap resource file paths in quotes

Browse Source 
This is required for paths that contain spaces, otherwise the .qrc
file generated by the build system is invalid, and the RCC run fails
at build time.

Change-Id: I887100b08052b49dd7ea4dd92b94f357a7d9d16e
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexandru Croitor 2019-08-12 14:05:05 +02:00
parent d87cd5cb2e
commit 87078650a5
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/cmake/pro2cmake.py
View File

@ -192,6 +192,9 @@ def write_add_qt_resource_call(target: str, resource_name: str, prefix: typing.O
output += 'set_source_files_properties("{}"\n' \
' PROPERTIES alias "{}"\n)\n'.format(full_source, alias)
# Quote file paths in case there are spaces.
sorted_files = ['"{}"'.format(f) for f in sorted_files]
if skip_qtquick_compiler:
file_list = '\n '.join(sorted_files)
output += 'set(resource_files\n {}\n)\n\n'.format(file_list)
@ -2137,6 +2140,10 @@ def write_qml_plugin_qml_files(cm_fh: typing.IO[str],
qml_files = scope.get_files('QML_FILES', use_vpath=True)
if qml_files:
# Quote file paths in case there are spaces.
qml_files = ['"{}"'.format(f) for f in qml_files]
cm_fh.write('\n{}set(qml_files\n{}{}\n)\n'.format(
spaces(indent),
spaces(indent + 1),