Replace uses of qVariantFromValue with QVariant::fromValue

Deprecated in Qt 5.14, alternative has been around since Qt 4 at least.

Change-Id: I4e3a53c289088368609e0d0ce2405a832d311308
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

7 files changed, 10 insertions, 10 deletions

diff --git a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
index f3e476fed3..94c0bbddc1 100644
--- a/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/saveitemsdialog.cpp
@@ -81,7 +81,7 @@ SaveItemsDialog::SaveItemsDialog(QWidget *parent,
                                                     << visibleName << QDir::toNativeSeparators(directory));
         if (!fileName.isEmpty())
             item->setIcon(0, FileIconProvider::icon(fileName));
-        item->setData(0, Qt::UserRole, qVariantFromValue(document));
+        item->setData(0, Qt::UserRole, QVariant::fromValue(document));
     }
 
     m_ui.treeWidget->resizeColumnToContents(0);
diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 191de4a412..77fb5c96ea 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -514,7 +514,7 @@ void ShortcutSettingsWidget::initialize()
         if (s->m_cmd->defaultKeySequence() != s->m_key)
             setModified(item, true);
 
-        item->setData(0, Qt::UserRole, qVariantFromValue(s));
+        item->setData(0, Qt::UserRole, QVariant::fromValue(s));
 
         markCollisions(s);
     }
diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.cpp b/src/plugins/coreplugin/find/searchresulttreemodel.cpp
index 150e9dcc09..3fba0f899d 100644
--- a/src/plugins/coreplugin/find/searchresulttreemodel.cpp
+++ b/src/plugins/coreplugin/find/searchresulttreemodel.cpp
@@ -258,7 +258,7 @@ QVariant SearchResultTreeModel::data(const SearchResultTreeItem *row, int role)
         result = row->item.text;
         break;
     case ItemDataRoles::ResultItemRole:
-        result = qVariantFromValue(row->item);
+        result = QVariant::fromValue(row->item);
         break;
     case ItemDataRoles::ResultBeginLineNumberRole:
         result = row->item.mainRange.begin.line;
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index dfcc50a9a5..b21afd2adc 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -210,7 +210,7 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const
             return QColor(Qt::darkGray);
         break;
     case LocatorEntryRole:
-        return qVariantFromValue(mEntries.at(index.row()));
+        return QVariant::fromValue(mEntries.at(index.row()));
     case int(HighlightingItemRole::StartColumn):
     case int(HighlightingItemRole::Length): {
         LocatorFilterEntry &entry = mEntries[index.row()];
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp
index a5750d13c7..e5ba03ace4 100644
--- a/src/plugins/coreplugin/mimetypesettings.cpp
+++ b/src/plugins/coreplugin/mimetypesettings.cpp
@@ -157,9 +157,9 @@ QVariant MimeTypeSettingsModel::data(const QModelIndex &modelIndex, int role) co
             return defaultHandler ? defaultHandler->displayName() : QString();
         }
     } else if (role == Qt::EditRole) {
-        return qVariantFromValue(handlersForMimeType(m_mimeTypes.at(modelIndex.row())));
+        return QVariant::fromValue(handlersForMimeType(m_mimeTypes.at(modelIndex.row())));
     } else if (role == int(Role::DefaultHandler)) {
-        return qVariantFromValue(defaultHandlerForMimeType(m_mimeTypes.at(modelIndex.row())));
+        return QVariant::fromValue(defaultHandlerForMimeType(m_mimeTypes.at(modelIndex.row())));
     } else if (role == Qt::FontRole) {
         if (column == 1) {
             const Utils::MimeType &type = m_mimeTypes.at(modelIndex.row());
@@ -397,7 +397,7 @@ void MimeTypeSettingsPrivate::editMagicHeaderRowData(const int row, const MagicD
     item->setText(1, QString::fromLatin1(Utils::Internal::MimeMagicRule::typeName(data.m_rule.type())));
     item->setText(2, QString::fromLatin1("%1:%2").arg(data.m_rule.startPos()).arg(data.m_rule.endPos()));
     item->setText(3, QString::number(data.m_priority));
-    item->setData(0, Qt::UserRole, qVariantFromValue(data));
+    item->setData(0, Qt::UserRole, QVariant::fromValue(data));
     m_ui.magicHeadersTreeWidget->takeTopLevelItem(row);
     m_ui.magicHeadersTreeWidget->insertTopLevelItem(row, item);
     m_ui.magicHeadersTreeWidget->setCurrentItem(item);
@@ -690,7 +690,7 @@ void MimeEditorDelegate::setEditorData(QWidget *editor, const QModelIndex &index
     auto box = static_cast<QComboBox *>(editor);
     const auto factories = index.model()->data(index, Qt::EditRole).value<QList<IEditorFactory *>>();
     for (IEditorFactory *factory : factories)
-        box->addItem(factory->displayName(), qVariantFromValue(factory));
+        box->addItem(factory->displayName(), QVariant::fromValue(factory));
     int currentIndex = factories.indexOf(
         index.model()
             ->data(index, int(MimeTypeSettingsModel::Role::DefaultHandler))
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index f223cfa777..aae3a618f9 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -260,7 +260,7 @@ void NavigationWidget::setFactories(const QList<INavigationWidgetFactory *> &fac
         }
 
         QStandardItem *newRow = new QStandardItem(factory->displayName());
-        newRow->setData(qVariantFromValue(factory), FactoryObjectRole);
+        newRow->setData(QVariant::fromValue(factory), FactoryObjectRole);
         newRow->setData(QVariant::fromValue(factory->id()), FactoryIdRole);
         newRow->setData(factory->priority(), FactoryPriorityRole);
         d->m_factoryModel->appendRow(newRow);
diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp
index 584cfb0ca9..7d072588a7 100644
--- a/src/plugins/coreplugin/systemsettings.cpp
+++ b/src/plugins/coreplugin/systemsettings.cpp
@@ -74,7 +74,7 @@ QWidget *SystemSettings::widget()
         if (HostOsInfo::isAnyUnixHost()) {
             const QVector<TerminalCommand> availableTerminals = ConsoleProcess::availableTerminalEmulators();
             for (const TerminalCommand &term : availableTerminals)
-                m_page->terminalComboBox->addItem(term.command, qVariantFromValue(term));
+                m_page->terminalComboBox->addItem(term.command, QVariant::fromValue(term));
             updateTerminalUi(ConsoleProcess::terminalEmulator(ICore::settings()));
             connect(m_page->terminalComboBox,
                     QOverload<int>::of(&QComboBox::currentIndexChanged),