diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:27:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:27:57 +0200 |
| commit | 198409ba76e18587526e9e1ec84fdb432c671937 (patch) | |
| tree | 2d06c052272ddfd1c9b34b863e342826a31d20b9 /tools | |
| parent | 9a98d16d9e49395a24cd733ca8f65b2f82ebba94 (diff) | |
| parent | e696a6b7bff04d1581cf59b4d96ecb5508f54169 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
tests/auto/qml/qjsengine/tst_qjsengine.cpp
Change-Id: I8276669e257f35a76768ef7f8795a8605cf4c9bc
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlcachegen/Qt5QuickCompilerConfig.cmake | 2 | ||||
| -rw-r--r-- | tools/qmlcachegen/generateloader.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake index 6fe1662995..56cb3fb55e 100644 --- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake +++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake @@ -44,7 +44,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles) set(rcc_file_with_compilation_units) - exec_program(${rcc_path} ARGS -list ${input_resource} OUTPUT_VARIABLE rcc_contents) + exec_program(${rcc_path} ARGS -list \"${input_resource}\" OUTPUT_VARIABLE rcc_contents) string(REGEX REPLACE "[\r\n]+" ";" rcc_contents ${rcc_contents}) foreach(it ${rcc_contents}) get_filename_component(extension ${it} EXT) diff --git a/tools/qmlcachegen/generateloader.cpp b/tools/qmlcachegen/generateloader.cpp index a2e673d15a..96528a9477 100644 --- a/tools/qmlcachegen/generateloader.cpp +++ b/tools/qmlcachegen/generateloader.cpp @@ -51,6 +51,7 @@ QString symbolNamespaceForPath(const QString &relativePath) symbol.replace(QLatin1Char('.'), QLatin1Char('_')); symbol.replace(QLatin1Char('+'), QLatin1Char('_')); symbol.replace(QLatin1Char('-'), QLatin1Char('_')); + symbol.replace(QLatin1Char(' '), QLatin1Char('_')); return symbol; } |