1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for immediate resources

Browse Source 
Collect files passed to RESOURCES and write out an add_qt_resources()
call. Similarly, for each "object" passed to RESOURCES (not a file),
write add_qt_resources(), too.

Change-Id: Idbb368ebb4d003a48e7c47ebaf53a78f65ebf9b9
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Simon Hausmann 2019-08-09 14:15:42 +02:00
parent 95c27e325f
commit 1fc117e29d
1 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
util/cmake/pro2cmake.py
View File

@ -170,6 +170,15 @@ def process_qrc_file(target: str, filepath: str, base_dir: str = '', project_fil
alias = path alias = path
files[path] = alias files[path] = alias
output += write_add_qt_resource_call(target, full_resource_name, prefix, base_dir, lang, files, skip_qtquick_compiler)
resource_count += 1
return output
def write_add_qt_resource_call(target: str, resource_name: str, prefix: typing.Optional[str], base_dir: typing.Optional[str], lang: typing.Optional[str], files: typing.Dict[str, str], skip_qtquick_compiler: bool) -> str:
output = ''
sorted_files = sorted(files.keys()) sorted_files = sorted(files.keys())
assert(sorted_files) assert(sorted_files)
@ -195,11 +204,8 @@ def process_qrc_file(target: str, filepath: str, base_dir: str = '', project_fil
params += ' PREFIX\n "{}"\n'.format(prefix) params += ' PREFIX\n "{}"\n'.format(prefix)
if base_dir: if base_dir:
params += ' BASE\n "{}"\n'.format(base_dir) params += ' BASE\n "{}"\n'.format(base_dir)
output += 'add_qt_resource({} "{}"\n{} FILES\n {}\n)\n'.format(target, full_resource_name, output += 'add_qt_resource({} "{}"\n{} FILES\n {}\n)\n'.format(target, resource_name,
params, params, file_list)
file_list)
resource_count += 1
return output return output
@ -1676,15 +1682,35 @@ def write_resources(cm_fh: typing.IO[str], target: str, scope: Scope, indent: in
qtquickcompiler_skipped = scope.get_files('QTQUICK_COMPILER_SKIPPED_RESOURCES') qtquickcompiler_skipped = scope.get_files('QTQUICK_COMPILER_SKIPPED_RESOURCES')
qrc_output = '' qrc_output = ''
if resources: if resources:
qrc_only = True standalone_files: typing.List[str] = []
for r in resources: for r in resources:
skip_qtquick_compiler = r in qtquickcompiler_skipped
if r.endswith('.qrc'): if r.endswith('.qrc'):
qrc_output += process_qrc_file(target, r, scope.basedir, scope.file_absolute_path, r in qtquickcompiler_skipped) qrc_output += process_qrc_file(target, r, scope.basedir, scope.file_absolute_path, skip_qtquick_compiler)
else: else:
qrc_only = False immediate_files = {f:"" for f in scope.get_files(r + ".files")}
if immediate_files:
immediate_prefix = scope.get(r + ".prefix")
if immediate_prefix:
immediate_prefix = immediate_prefix[0]
else:
immediate_prefix = "/"
immediate_base = scope.get(r + ".base")
immediate_lang = None
immediate_name = "qmake_" + r
qrc_output += write_add_qt_resource_call(target, immediate_name, immediate_prefix, immediate_base, immediate_lang, immediate_files, skip_qtquick_compiler)
else:
standalone_files.append(r)
if standalone_files:
name = "qmake_immediate"
prefix = "/"
base = None
lang = None
files = {f:"" for f in standalone_files}
skip_qtquick_compiler = False
qrc_output += write_add_qt_resource_call(target, name, prefix, base, lang, files, skip_qtquick_compiler)
if not qrc_only:
print(' XXXX Ignoring non-QRC file resources.')
if qrc_output: if qrc_output:
cm_fh.write('\n# Resources:\n') cm_fh.write('\n# Resources:\n')