diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-16 17:49:05 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-17 06:45:59 +0200 |
| commit | fe3bebbd68e9b0eca1b4cef8671853ed4ff630d2 (patch) | |
| tree | 9f4ead4dd451e90e2604cae150b138d4eec9ce2a /tests/auto/tools | |
| parent | b850322147250a1bd35d5c63e958dec161284244 (diff) | |
Fix deprecation warnings in tests
Adjust to changes to QIcon::pixmap, QMetaType::type, and
QAbstractItemView::itemDelegate.
Change-Id: I9eb0331ef899131afc86c33f27feeee76331ffc8
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/auto/tools')
| -rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index cee6d47dbd..39712c6d22 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -3425,12 +3425,12 @@ void tst_Moc::autoSignalSpyMetaTypeRegistration() QVERIFY(i > 0); - QCOMPARE(QMetaType::type("CustomObject12"), (int)QMetaType::UnknownType); + QCOMPARE(QMetaType::fromName("CustomObject12").id(), (int)QMetaType::UnknownType); QSignalSpy spy(&aro, SIGNAL(someSignal(CustomObject12))); - QVERIFY(QMetaType::type("CustomObject12") != QMetaType::UnknownType); - QCOMPARE(QMetaType::type("CustomObject12"), qMetaTypeId<CustomObject12>()); + QVERIFY(QMetaType::fromName("CustomObject12").id() != QMetaType::UnknownType); + QCOMPARE(QMetaType::fromName("CustomObject12").id(), qMetaTypeId<CustomObject12>()); } void tst_Moc::parseDefines() |