diff options
| author | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2023-01-11 18:50:14 +0100 |
|---|---|---|
| committer | Amir Masoud Abdol <amirmasoudabdol@icloud.com> | 2023-01-20 20:41:30 +0100 |
| commit | 1b5562d67764eb7bea28fc4a2fd357810ac1a859 (patch) | |
| tree | a53541780065a9f0d7386e3ef58554b4060e4800 | |
| parent | 34d2121d1c2f0b4193496ccfa268c93ac0814e2c (diff) | |
Retire the qt_parse_all_arguments
Task-number: QTBUG-99238
Change-Id: I68008cf74ebf7586f0e65005ffbce474a2890146
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | cmake/QtRepoSetup.cmake | 3 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlstatemachine/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlstatemachinemetatype/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/qml/scxmlqmlcpp/CMakeLists.txt | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/cmake/QtRepoSetup.cmake b/cmake/QtRepoSetup.cmake index 400ad2e..c093733 100644 --- a/cmake/QtRepoSetup.cmake +++ b/cmake/QtRepoSetup.cmake @@ -9,7 +9,8 @@ function(add_qt_statecharts target) return() endif() - qt_parse_all_arguments(arg "add_qt_statecharts" "" "" "FILES" ${ARGN}) + cmake_parse_arguments(PARSE_ARGV 1 arg "" "" "FILES") + _qt_internal_validate_all_args_are_parsed(arg) qt6_add_statecharts(${target} ${arg_FILES}) endfunction() diff --git a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt index 16a9970..e0e50da 100644 --- a/tests/auto/qml/qqmlstatemachine/CMakeLists.txt +++ b/tests/auto/qml/qqmlstatemachine/CMakeLists.txt @@ -33,10 +33,10 @@ qt_internal_add_test(tst_qqmlstatemachine qt_internal_extend_target(tst_qqmlstatemachine CONDITION ANDROID OR IOS DEFINES - QT_QMLTEST_DATADIR=\\\":/data\\\" + QT_QMLTEST_DATADIR=":/data" ) qt_internal_extend_target(tst_qqmlstatemachine CONDITION NOT ANDROID AND NOT IOS DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + QT_QMLTEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data" ) diff --git a/tests/auto/qml/qqmlstatemachinemetatype/CMakeLists.txt b/tests/auto/qml/qqmlstatemachinemetatype/CMakeLists.txt index e7da045..a530969 100644 --- a/tests/auto/qml/qqmlstatemachinemetatype/CMakeLists.txt +++ b/tests/auto/qml/qqmlstatemachinemetatype/CMakeLists.txt @@ -27,11 +27,11 @@ qt_internal_add_test(tst_qqmlstatemachinemetatype qt_internal_extend_target(tst_qqmlstatemachinemetatype CONDITION ANDROID OR IOS DEFINES - QT_QMLTEST_DATADIR=\\\":/data\\\" + QT_QMLTEST_DATADIR=":/data" ) qt_internal_extend_target(tst_qqmlstatemachinemetatype CONDITION NOT ANDROID AND NOT IOS DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + QT_QMLTEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data" ) diff --git a/tests/auto/qml/scxmlqmlcpp/CMakeLists.txt b/tests/auto/qml/scxmlqmlcpp/CMakeLists.txt index 88fe525..dfa3345 100644 --- a/tests/auto/qml/scxmlqmlcpp/CMakeLists.txt +++ b/tests/auto/qml/scxmlqmlcpp/CMakeLists.txt @@ -21,12 +21,12 @@ qt_internal_add_test(tst_scxmlqmlcpp qt_internal_extend_target(tst_scxmlqmlcpp CONDITION ANDROID OR IOS DEFINES - QT_QMLTEST_DATADIR=\\\":/data\\\" + QT_QMLTEST_DATADIR=":/data" ) qt_internal_extend_target(tst_scxmlqmlcpp CONDITION NOT ANDROID AND NOT IOS DEFINES - QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" + QT_QMLTEST_DATADIR="${CMAKE_CURRENT_SOURCE_DIR}/data" ) qt6_add_statecharts(tst_scxmlqmlcpp |