Merge "Port away from deprecated QVariant::type"

2021-03-17 12:02:07 +01:00 · 2021-03-17 12:02:07 +01:00 · 0f51d2a6ed
parent e6a0b26729 5c396be4e3
commit 0f51d2a6ed
1 changed files with 3 additions and 3 deletions
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@ -518,11 +518,11 @@ void tst_QClipboard::testWindowsMime()
    nativeWindowsApp->registerMime(&testMime);

    auto clipboard = QGuiApplication::clipboard();
-    switch (data.type()) {
-    case QVariant::String:
+    switch (data.metaType().id()) {
+    case QMetaType::QString:
        clipboard->setText(data.toString());
        break;
-    case QVariant::Pixmap:
+    case QMetaType::QPixmap:
        clipboard->setPixmap(data.value<QPixmap>());
        break;
    default: