diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2022-08-24 15:25:36 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2022-09-29 21:31:17 +0800 |
| commit | e7c1fec763f3113b45e2b3b9b67392cbd06cb37c (patch) | |
| tree | 259601cfd2a33d75db9ea287e5181cfed47ac6bf /tests/auto/qml/qqmlsettings | |
| parent | cd62ba232a4a6ee349ea983179dd8b85ccdf89d3 (diff) | |
Move Settings out of Qt.labs module
Move Settings from the Qt.labs module to the QtCore module.
And deprecate the original one in Qt.labs.
Also changed the fileName(QString) property to location(QUrl)
to better fit the Qt API.
Adjust the tests accordingly.
Task-number: QTBUG-92806
Change-Id: I1cbad1315383a9f2963583fd4d00cf3612f99f1e
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlsettings')
| -rw-r--r-- | tests/auto/qml/qqmlsettings/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/qqmlsettings/CMakeLists.txt b/tests/auto/qml/qqmlsettings/CMakeLists.txt index d355285f04..0d4b45e55e 100644 --- a/tests/auto/qml/qqmlsettings/CMakeLists.txt +++ b/tests/auto/qml/qqmlsettings/CMakeLists.txt @@ -4,7 +4,7 @@ # Generated from qqmlsettings.pro. ##################################################################### -## tst_qqmlsettings Test: +## tst_qqmlsettings_labs Test: ##################################################################### # Collect test data @@ -13,7 +13,7 @@ file(GLOB_RECURSE test_data_glob data/*) list(APPEND test_data ${test_data_glob}) -qt_internal_add_test(tst_qqmlsettings +qt_internal_add_test(tst_qqmlsettings_labs SOURCES tst_qqmlsettings.cpp LIBRARIES @@ -26,12 +26,12 @@ qt_internal_add_test(tst_qqmlsettings ## Scopes: ##################################################################### -qt_internal_extend_target(tst_qqmlsettings CONDITION ANDROID OR IOS +qt_internal_extend_target(tst_qqmlsettings_labs CONDITION ANDROID OR IOS DEFINES QT_QMLTEST_DATADIR=\\\":/data\\\" ) -qt_internal_extend_target(tst_qqmlsettings CONDITION NOT ANDROID AND NOT IOS +qt_internal_extend_target(tst_qqmlsettings_labs CONDITION NOT ANDROID AND NOT IOS DEFINES QT_QMLTEST_DATADIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/data\\\" ) |