diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2018-03-26 10:38:35 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-03-27 18:44:18 +0000 |
| commit | 3ae0e1504e94e5c531fa5e919cc8e9f503a5bd34 (patch) | |
| tree | 48861774787785de7391ce27ae5d60e12661be67 | |
| parent | ae966127fd7c14669dc202a6d30dc8cf56164f94 (diff) | |
qtquick_compiler_add_resources() with spaces in paths
Ensure a quoted path when constructing the command line for rcc -list.
Change-Id: I43e31015e3de58f65f46d2e594cb362d71b123ed
Task-number: QTBUG-57758
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
| -rw-r--r-- | tests/auto/cmake/qtquickcompiler/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/cmake/qtquickcompiler/resources with space/main.qml (renamed from tests/auto/cmake/qtquickcompiler/main.qml) | 0 | ||||
| -rw-r--r-- | tests/auto/cmake/qtquickcompiler/resources with space/qqc_test.qrc (renamed from tests/auto/cmake/qtquickcompiler/qqc_test.qrc) | 2 | ||||
| -rw-r--r-- | tools/qmlcachegen/Qt5QuickCompilerConfig.cmake | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/cmake/qtquickcompiler/CMakeLists.txt b/tests/auto/cmake/qtquickcompiler/CMakeLists.txt index ded79d87ed..4e46544767 100644 --- a/tests/auto/cmake/qtquickcompiler/CMakeLists.txt +++ b/tests/auto/cmake/qtquickcompiler/CMakeLists.txt @@ -9,7 +9,7 @@ find_package(Qt5QuickCompiler) set(CMAKE_CXXFLAGS "${CMAKE_CXXFLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") -qtquick_compiler_add_resources(RESOURCES qqc_test.qrc) +qtquick_compiler_add_resources(RESOURCES "resources with space/qqc_test.qrc") set(CMAKE_AUTOMOC ON) diff --git a/tests/auto/cmake/qtquickcompiler/main.qml b/tests/auto/cmake/qtquickcompiler/resources with space/main.qml index 0836808dc2..0836808dc2 100644 --- a/tests/auto/cmake/qtquickcompiler/main.qml +++ b/tests/auto/cmake/qtquickcompiler/resources with space/main.qml diff --git a/tests/auto/cmake/qtquickcompiler/qqc_test.qrc b/tests/auto/cmake/qtquickcompiler/resources with space/qqc_test.qrc index f128b7004b..63d8d1f37e 100644 --- a/tests/auto/cmake/qtquickcompiler/qqc_test.qrc +++ b/tests/auto/cmake/qtquickcompiler/resources with space/qqc_test.qrc @@ -1,6 +1,6 @@ <!DOCTYPE RCC><RCC version="1.0"> <qresource> <file>./main.qml</file> -<file>./main.cpp</file> +<file alias="main.cpp">../main.cpp</file> </qresource> </RCC> 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) |