whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clear tst_QSettings of deprecation warnings 

Assorted QMetaType and QVariant methods deprecated in Qt 6 were still
in use - the deprecation warnings were suppressed by setting
QT_DISABLE_DEPRECATED_BEFORE=0 - fix them and clear that suppression.

Change-Id: I1aa8f45dcb5a18449b060b346c80ad70536896ab
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
bb10
Edward Welbourne 2022-04-20 14:26:25 +02:00
parent 2d0c603cdb
commit f056eed02e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/corelib/io/qsettings/CMakeLists.txt
View File

@ -20,8 +20,6 @@ set(qsettings_resource_files
qt_internal_add_test(tst_qsettings
SOURCES
tst_qsettings.cpp
DEFINES
QT_DISABLE_DEPRECATED_BEFORE=0
INCLUDE_DIRECTORIES
../../kernel/qmetatype
PUBLIC_LIBRARIES

10
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
View File

@ -949,7 +949,7 @@ void tst_QSettings::testIniParsing()
if ( settings.status() == QSettings::NoError ) { // else no point proceeding
QVariant v = settings.value(key);
if (expect.isValid())
QVERIFY(v.canConvert(expect.type()));
QVERIFY(v.canConvert(expect.metaType()));
// check some types so as to give prettier error messages
if ( v.typeId() == QMetaType::QString ) {
QCOMPARE(v.toString(), expect.toString());
@ -1177,7 +1177,7 @@ template<int MetaTypeId>
static void testMetaTypesHelper(QSettings::Format format)
{
typedef typename MetaEnumToType<MetaTypeId>::Type Type;
const char *key = QMetaType::typeName(MetaTypeId);
const char *key = QMetaType(MetaTypeId).name();
Type *value = TestValueFactory<MetaTypeId>::create();
QVariant inputVariant = QVariant::fromValue(*value);
@ -1196,8 +1196,8 @@ static void testMetaTypesHelper(QSettings::Format format)
QSettings settings(format, scope, organization, applicationName);
QVariant outputVariant = settings.value(key);
if (MetaTypeId != QMetaType::QVariant)
QVERIFY(outputVariant.canConvert(MetaTypeId));
if (outputVariant.type() != inputVariant.type())
QVERIFY(outputVariant.canConvert(QMetaType(MetaTypeId)));
if (outputVariant.typeId() != inputVariant.typeId())
qWarning() << "type mismatch between" << inputVariant << "and" << outputVariant;
QCOMPARE(qvariant_cast<Type >(outputVariant), *value);
}
@ -1236,7 +1236,7 @@ void tst_QSettings::testMetaTypes_data()
#define ADD_METATYPE_TEST_ROW(MetaTypeName, MetaTypeId, RealType) \
{ \
const char *formatName = QMetaEnum::fromType<QSettings::Format>().valueToKey(formats[i]); \
const char *typeName = QMetaType::typeName(QMetaType::MetaTypeName); \
const char *typeName = QMetaType(QMetaType::MetaTypeName).name(); \
QTest::newRow(QString("%1:%2").arg(formatName).arg(typeName).toLatin1().constData()) \
<< QSettings::Format(formats[i]) << int(QMetaType::MetaTypeName); \
}