From 95542b386ac7882deb83a1a0d83436c68bbb6d59 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Tue, 16 Aug 2022 18:31:32 +0200 Subject: tst_qobject: port away from deprecated methods The patch includes the following replacements: * QMetaType::type("name") -> QMetaType::fromType().id() * QMetaProperty::type() -> QMetaProperty::typeId() * QVariant::Type -> QMetaType::Type * qRegisterMetaType("name") -> qResigeterMetaType() * 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 --- tests/auto/corelib/kernel/qobject/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'tests/auto/corelib/kernel/qobject/CMakeLists.txt') 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 -- cgit v1.2.3