diff options
| author | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2023-01-19 18:17:11 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2023-01-20 23:02:28 +0100 |
| commit | d8e6ec1f53f9c181b3e12db8c1de9e1f155fe8a5 (patch) | |
| tree | c687de6f7470a909b9d38fb0adbb5d31e8356ece | |
| parent | e740812960bb1e59a9a0f99d2b8663266b32f7f9 (diff) | |
Fix the broken test after the retirement of qt_parse_all_arguments
As we are now processing the arguments with
cmake_parse_arguments(PARSE_ARGV, we don't need to pass the escape
characters anymore.
Task-number: QTBUG-99238
Change-Id: I9e288c8e9b95e4ef498e4dedcffa0c90d57718ab
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | src/plugins/myscript/plugin/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/settings/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tests/auto/layoutfilesystem/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/layoutresources/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/styles/CMakeLists.txt | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/plugins/myscript/plugin/CMakeLists.txt b/src/plugins/myscript/plugin/CMakeLists.txt index ee47915d..09dec9c5 100644 --- a/src/plugins/myscript/plugin/CMakeLists.txt +++ b/src/plugins/myscript/plugin/CMakeLists.txt @@ -33,11 +33,11 @@ qt_internal_add_qml_module(qtvkbmyscriptplugin myscriptinputmethod_p_p.h myscriptplugin.cpp myscriptplugin.h DEFINES - MYSCRIPT_CERTIFICATE=\\\"${MyScript_ROOT_DIR}/edk/c/examples/certificates/MyCertificate.c\\\" - MYSCRIPT_VOIM_PROPERTY_PATH=\\\"${MYSCRIPT_INSTALL_DATA}/${MYSCRIPT_VOIM_PROPERTY_NAME}\\\" - MYSCRIPT_LANGUAGE_CONF_PATH=\\\"${MYSCRIPT_INSTALL_DATA}/${MYSCRIPT_LANGUAGE_CONF_NAME}\\\" - MYSCRIPT_VOIM_NAME=\\\"${MYSCRIPT_VOIM_NAME}\\\" - MYSCRIPT_ENGINE_NAME=\\\"${MYSCRIPT_ENGINE_NAME}\\\" + MYSCRIPT_CERTIFICATE="${MyScript_ROOT_DIR}/edk/c/examples/certificates/MyCertificate.c" + MYSCRIPT_VOIM_PROPERTY_PATH="${MYSCRIPT_INSTALL_DATA}/${MYSCRIPT_VOIM_PROPERTY_NAME}" + MYSCRIPT_LANGUAGE_CONF_PATH="${MYSCRIPT_INSTALL_DATA}/${MYSCRIPT_LANGUAGE_CONF_NAME}" + MYSCRIPT_VOIM_NAME="${MYSCRIPT_VOIM_NAME}" + MYSCRIPT_ENGINE_NAME="${MYSCRIPT_ENGINE_NAME}" # POSIX source must be required to use "strdup" for "Properties.c" _POSIX_C_SOURCE=200809L INCLUDE_DIRECTORIES diff --git a/src/settings/CMakeLists.txt b/src/settings/CMakeLists.txt index 775202b1..08d5f285 100644 --- a/src/settings/CMakeLists.txt +++ b/src/settings/CMakeLists.txt @@ -19,7 +19,7 @@ qt_internal_add_qml_module(qtvkbsettingsplugin QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_CAST_TO_ASCII - QT_VIRTUALKEYBOARD_DEFAULT_LAYOUTS_DIR=\\\"qrc:${VKB_LAYOUTS_PREFIX}\\\" + QT_VIRTUALKEYBOARD_DEFAULT_LAYOUTS_DIR="qrc:${VKB_LAYOUTS_PREFIX}" LIBRARIES Qt::Core Qt::Gui @@ -30,16 +30,16 @@ qt_internal_add_qml_module(qtvkbsettingsplugin qt_internal_extend_target(qtvkbsettingsplugin CONDITION QT_FEATURE_vkb_no_builtin_style DEFINES - QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"\\\" + QT_VIRTUALKEYBOARD_DEFAULT_STYLE="" ) qt_internal_extend_target(qtvkbsettingsplugin CONDITION QT_FEATURE_vkb_retro_style AND NOT QT_FEATURE_vkb_no_builtin_style DEFINES - QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"retro\\\" + QT_VIRTUALKEYBOARD_DEFAULT_STYLE="retro" ) qt_internal_extend_target(qtvkbsettingsplugin CONDITION NOT QT_FEATURE_vkb_no_builtin_style AND NOT QT_FEATURE_vkb_retro_style DEFINES - QT_VIRTUALKEYBOARD_DEFAULT_STYLE=\\\"default\\\" + QT_VIRTUALKEYBOARD_DEFAULT_STYLE="default" ) diff --git a/tests/auto/layoutfilesystem/CMakeLists.txt b/tests/auto/layoutfilesystem/CMakeLists.txt index 5751f2a6..0232b449 100644 --- a/tests/auto/layoutfilesystem/CMakeLists.txt +++ b/tests/auto/layoutfilesystem/CMakeLists.txt @@ -12,7 +12,7 @@ qt_internal_add_test(tst_layoutfilesystem ../shared/layouttesthelper.cpp ../shared/layouttesthelper.h tst_layoutfilesystem.cpp DEFINES - SRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" INCLUDE_DIRECTORIES ../shared LIBRARIES diff --git a/tests/auto/layoutresources/CMakeLists.txt b/tests/auto/layoutresources/CMakeLists.txt index 3f479505..42c26bf5 100644 --- a/tests/auto/layoutresources/CMakeLists.txt +++ b/tests/auto/layoutresources/CMakeLists.txt @@ -12,7 +12,7 @@ qt_internal_add_test(tst_layoutresources ../shared/layouttesthelper.cpp ../shared/layouttesthelper.h tst_layoutresources.cpp DEFINES - SRC_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" INCLUDE_DIRECTORIES ../shared LIBRARIES diff --git a/tests/auto/styles/CMakeLists.txt b/tests/auto/styles/CMakeLists.txt index 7a3c583e..96462675 100644 --- a/tests/auto/styles/CMakeLists.txt +++ b/tests/auto/styles/CMakeLists.txt @@ -18,7 +18,7 @@ qt_internal_add_test(tst_styles SOURCES tst_styles.cpp DEFINES - TESTDATA_DIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + TESTDATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/data" LIBRARIES Qt::Gui TESTDATA ${test_data} |