diff options
| author | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-16 18:31:32 +0200 |
|---|---|---|
| committer | Ivan Solovev <ivan.solovev@qt.io> | 2022-08-30 22:46:35 +0200 |
| commit | 95542b386ac7882deb83a1a0d83436c68bbb6d59 (patch) | |
| tree | 094370cf1b3ccf6f568a619a086354ce67fe43be /tests/auto/corelib/kernel/qobject/CMakeLists.txt | |
| parent | ad12d779cc2243dc3bca1deed58d4a3b67176a94 (diff) | |
tst_qobject: port away from deprecated methods
The patch includes the following replacements:
* QMetaType::type("name") -> QMetaType::fromType<Type>().id()
* QMetaProperty::type() -> QMetaProperty::typeId()
* QVariant::Type -> QMetaType::Type
* qRegisterMetaType<T>("name") -> qResigeterMetaType<T>()
* The static QMetaType::{load,save} methods are replaced with
non-static versions
* Replace QCOMPARE(property.type(), QVariant::UserType) with
QCOMPARE_GT(property.typeId(), QMetaType::User), because the
deprecated type() method was treating each custom type
(id >= QVariant::UserType) as QVariant::UserType, while the
typeId() method simply returns the actual id.
As a drive-by: remove unneeded QMetaType registration tests
as we have tst_QMetaType to check it.
Task-number: QTBUG-104858
Change-Id: Ia08e002efdf07ff83366a5193164dba96a956f9a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qobject/CMakeLists.txt')
| -rw-r--r-- | tests/auto/corelib/kernel/qobject/CMakeLists.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/corelib/kernel/qobject/CMakeLists.txt b/tests/auto/corelib/kernel/qobject/CMakeLists.txt index d3b29e4d71..276f6e64e0 100644 --- a/tests/auto/corelib/kernel/qobject/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qobject/CMakeLists.txt @@ -10,8 +10,6 @@ qt_internal_add_test(tst_qobject SOURCES tst_qobject.cpp - DEFINES - QT_DISABLE_DEPRECATED_UP_TO=0 LIBRARIES Qt::CorePrivate Qt::Network |