diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-16 10:31:07 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-03-16 10:31:07 +0100 |
| commit | 198606f6dbca95ba3a170fff387327d8271018cd (patch) | |
| tree | 79e8c632f5277fc7f0ae30ae7fb1e1c41745c815 /tests/auto/cmake/test_add_resource_options/CMakeLists.txt | |
| parent | 77c0c1ca6505eb66bd75b3766f9a498574822bd1 (diff) | |
| parent | 0d5ffd67a4748bcbf19dc3a4b9a36ae6314e58a6 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/plugins/platforms/xcb/qxcbnativeinterface.cpp
src/plugins/platforms/xcb/qxcbnativeinterface.h
Change-Id: I31b38ba439b9341d51a01c0fd54bea33f7410076
Diffstat (limited to 'tests/auto/cmake/test_add_resource_options/CMakeLists.txt')
| -rw-r--r-- | tests/auto/cmake/test_add_resource_options/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/cmake/test_add_resource_options/CMakeLists.txt b/tests/auto/cmake/test_add_resource_options/CMakeLists.txt index a358094546..5fcae59dfe 100644 --- a/tests/auto/cmake/test_add_resource_options/CMakeLists.txt +++ b/tests/auto/cmake/test_add_resource_options/CMakeLists.txt @@ -20,6 +20,9 @@ qt5_wrap_cpp(moc_files myobject.h) # in the add_executable call. qt5_add_resources(rcc_files "test_macro_options.qrc" OPTIONS -binary) +# Test if OPTIONS can handle a quoted parameter. CMake would fail immediately! +qt5_add_resources(rcc_files_quoted_option "test_macro_options.qrc" OPTIONS -root "/") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") add_executable(myobject myobject.cpp ${moc_files} ${rcc_files}) |