diff options
Diffstat (limited to 'src')
31 files changed, 37 insertions, 37 deletions
diff --git a/src/libs/extensionsystem/pluginerroroverview.cpp b/src/libs/extensionsystem/pluginerroroverview.cpp index 828bd013f4..74e7ac73b0 100644 --- a/src/libs/extensionsystem/pluginerroroverview.cpp +++ b/src/libs/extensionsystem/pluginerroroverview.cpp @@ -45,7 +45,7 @@ PluginErrorOverview::PluginErrorOverview(QWidget *parent) : // only show errors on startup if plugin is enabled. if (spec->hasError() && spec->isEffectivelyEnabled()) { QListWidgetItem *item = new QListWidgetItem(spec->name()); - item->setData(Qt::UserRole, qVariantFromValue(spec)); + item->setData(Qt::UserRole, QVariant::fromValue(spec)); m_ui->pluginList->addItem(item); } } diff --git a/src/libs/qmldebug/baseenginedebugclient.cpp b/src/libs/qmldebug/baseenginedebugclient.cpp index 86f54741fc..45cf7590c9 100644 --- a/src/libs/qmldebug/baseenginedebugclient.cpp +++ b/src/libs/qmldebug/baseenginedebugclient.cpp @@ -121,7 +121,7 @@ void BaseEngineDebugClient::decode(QDataStream &ds, { ObjectReference obj; obj.m_debugId = prop.m_value.toInt(); - prop.m_value = qVariantFromValue(obj); + prop.m_value = QVariant::fromValue(obj); break; } case QmlObjectProperty::Unknown: diff --git a/src/plugins/baremetal/gdbserverproviderchooser.cpp b/src/plugins/baremetal/gdbserverproviderchooser.cpp index d1354f7122..764a9ee0cd 100644 --- a/src/plugins/baremetal/gdbserverproviderchooser.cpp +++ b/src/plugins/baremetal/gdbserverproviderchooser.cpp @@ -110,7 +110,7 @@ void GdbServerProviderChooser::populate() for (const GdbServerProvider *p : GdbServerProviderManager::providers()) { if (!providerMatches(p)) continue; - m_chooser->addItem(providerText(p), qVariantFromValue(p->id())); + m_chooser->addItem(providerText(p), QVariant::fromValue(p->id())); } } diff --git a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp index 702d4557b6..cd90c29fb4 100644 --- a/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp +++ b/src/plugins/clangcodemodel/clangcurrentdocumentfilter.cpp @@ -76,7 +76,7 @@ static Core::LocatorFilterEntry makeEntry(Core::ILocatorFilter *filter, const ClangBackEnd::ExtraInfo &extraInfo = info.extraInfo; QString displayName = extraInfo.token; ::Utils::LineColumn lineColumn(static_cast<int>(info.line), static_cast<int>(info.column)); - Core::LocatorFilterEntry entry(filter, displayName, qVariantFromValue(lineColumn)); + Core::LocatorFilterEntry entry(filter, displayName, QVariant::fromValue(lineColumn)); QString extra; ClangBackEnd::HighlightingType mainType = info.types.mainHighlightingType; if (mainType == ClangBackEnd::HighlightingType::VirtualFunction 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), diff --git a/src/plugins/cpptools/builtinindexingsupport.cpp b/src/plugins/cpptools/builtinindexingsupport.cpp index ff21e85500..ddde5699a1 100644 --- a/src/plugins/cpptools/builtinindexingsupport.cpp +++ b/src/plugins/cpptools/builtinindexingsupport.cpp @@ -310,7 +310,7 @@ public: item.path = scope.split(QLatin1String("::"), QString::SkipEmptyParts); item.text = text; item.icon = info->icon(); - item.userData = qVariantFromValue(info); + item.userData = QVariant::fromValue(info); resultItems << item; } diff --git a/src/plugins/cpptools/cppclassesfilter.cpp b/src/plugins/cpptools/cppclassesfilter.cpp index 1306a155a4..ee691ba98b 100644 --- a/src/plugins/cpptools/cppclassesfilter.cpp +++ b/src/plugins/cpptools/cppclassesfilter.cpp @@ -43,7 +43,7 @@ CppClassesFilter::~CppClassesFilter() = default; Core::LocatorFilterEntry CppClassesFilter::filterEntryFromIndexItem(IndexItem::Ptr info) { - const QVariant id = qVariantFromValue(info); + const QVariant id = QVariant::fromValue(info); Core::LocatorFilterEntry filterEntry(this, info->symbolName(), id, info->icon()); filterEntry.extraInfo = info->symbolScope().isEmpty() ? info->shortNativeFilePath() diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp index be1163d168..fdd4920504 100644 --- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp +++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp @@ -83,7 +83,7 @@ QList<Core::LocatorFilterEntry> CppCurrentDocumentFilter::matchesFor( QRegularExpressionMatch match = regexp.match(matchString); if (match.hasMatch()) { const bool betterMatch = match.capturedStart() == 0; - QVariant id = qVariantFromValue(info); + QVariant id = QVariant::fromValue(info); QString name = matchString; QString extraInfo = info->symbolScope(); if (info->type() == IndexItem::Function) { diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 867b3d395a..b42796c194 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -351,7 +351,7 @@ void CppFindReferences::findUsages(CPlusPlus::Symbol *symbol, parameters.prettySymbolName = overview.prettyName(context.path(symbol).constLast()); } - search->setUserData(qVariantFromValue(parameters)); + search->setUserData(QVariant::fromValue(parameters)); findAll_helper(search, symbol, context); } @@ -571,7 +571,7 @@ static void displayResults(SearchResult *search, QFutureWatcher<CPlusPlus::Usage parameters.filesToRename.append(node); } - search->setUserData(qVariantFromValue(parameters)); + search->setUserData(QVariant::fromValue(parameters)); } static void searchFinished(SearchResult *search, QFutureWatcher<CPlusPlus::Usage> *watcher) diff --git a/src/plugins/cpptools/cppfunctionsfilter.cpp b/src/plugins/cpptools/cppfunctionsfilter.cpp index f2897215df..9e023b2c64 100644 --- a/src/plugins/cpptools/cppfunctionsfilter.cpp +++ b/src/plugins/cpptools/cppfunctionsfilter.cpp @@ -45,7 +45,7 @@ CppFunctionsFilter::~CppFunctionsFilter() = default; Core::LocatorFilterEntry CppFunctionsFilter::filterEntryFromIndexItem(IndexItem::Ptr info) { - const QVariant id = qVariantFromValue(info); + const QVariant id = QVariant::fromValue(info); QString name = info->symbolName(); QString extraInfo = info->symbolScope(); diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp index 6865cbe5a2..aa85f8d33f 100644 --- a/src/plugins/cpptools/cpplocatorfilter.cpp +++ b/src/plugins/cpptools/cpplocatorfilter.cpp @@ -50,7 +50,7 @@ CppLocatorFilter::~CppLocatorFilter() = default; Core::LocatorFilterEntry CppLocatorFilter::filterEntryFromIndexItem(IndexItem::Ptr info) { - const QVariant id = qVariantFromValue(info); + const QVariant id = QVariant::fromValue(info); Core::LocatorFilterEntry filterEntry(this, info->scopedSymbolName(), id, info->icon()); if (info->type() == IndexItem::Class || info->type() == IndexItem::Enum) filterEntry.extraInfo = info->shortNativeFilePath(); diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp index f6bc1f52ba..dd8dc4694d 100644 --- a/src/plugins/cpptools/symbolsfindfilter.cpp +++ b/src/plugins/cpptools/symbolsfindfilter.cpp @@ -119,7 +119,7 @@ void SymbolsFindFilter::findAll(const QString &txt, FindFlags findFlags) parameters.flags = findFlags; parameters.types = m_symbolsToSearch; parameters.scope = m_scope; - search->setUserData(qVariantFromValue(parameters)); + search->setUserData(QVariant::fromValue(parameters)); startSearch(search); } diff --git a/src/plugins/git/gerrit/gerritmodel.cpp b/src/plugins/git/gerrit/gerritmodel.cpp index 931ce338d8..27946a2dec 100644 --- a/src/plugins/git/gerrit/gerritmodel.cpp +++ b/src/plugins/git/gerrit/gerritmodel.cpp @@ -842,7 +842,7 @@ QList<QStandardItem *> GerritModel::changeToRow(const GerritChangePtr &c) const { QList<QStandardItem *> row; const QVariant filterV = QVariant(c->filterString()); - const QVariant changeV = qVariantFromValue(c); + const QVariant changeV = QVariant::fromValue(c); for (int i = 0; i < GerritModel::ColumnCount; ++i) { auto item = new QStandardItem; item->setData(changeV, GerritModel::GerritChangeRole); diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp index c6c437af35..65d698ec0b 100644 --- a/src/plugins/git/gitgrep.cpp +++ b/src/plugins/git/gitgrep.cpp @@ -291,7 +291,7 @@ QVariant GitGrep::parameters() const params.ref = m_treeLineEdit->text(); if (m_recurseSubmodules) params.recurseSubmodules = m_recurseSubmodules->isChecked(); - return qVariantFromValue(params); + return QVariant::fromValue(params); } void GitGrep::readSettings(QSettings *settings) diff --git a/src/plugins/help/helpplugin.cpp b/src/plugins/help/helpplugin.cpp index a887dc5371..780787271c 100644 --- a/src/plugins/help/helpplugin.cpp +++ b/src/plugins/help/helpplugin.cpp @@ -400,7 +400,7 @@ void HelpPluginPrivate::saveExternalWindowSettings() return; m_externalWindowState = m_externalWindow->geometry(); QSettings *settings = ICore::settings(); - settings->setValue(kExternalWindowStateKey, qVariantFromValue(m_externalWindowState)); + settings->setValue(kExternalWindowStateKey, QVariant::fromValue(m_externalWindowState)); } HelpWidget *HelpPluginPrivate::createHelpWidget(const Context &context, HelpWidget::WidgetStyle style) diff --git a/src/plugins/languageclient/locatorfilter.cpp b/src/plugins/languageclient/locatorfilter.cpp index 92da6a642c..973e098274 100644 --- a/src/plugins/languageclient/locatorfilter.cpp +++ b/src/plugins/languageclient/locatorfilter.cpp @@ -106,7 +106,7 @@ Core::LocatorFilterEntry generateLocatorEntry(const SymbolInformation &info, if (Utils::optional<QString> container = info.containerName()) entry.extraInfo = container.value_or(QString()); entry.displayIcon = symbolIcon(info.kind()); - entry.internalData = qVariantFromValue(info.location().toLink()); + entry.internalData = QVariant::fromValue(info.location().toLink()); return entry; } @@ -120,7 +120,7 @@ Core::LocatorFilterEntry generateLocatorEntry(const DocumentSymbol &info, entry.extraInfo = detail.value_or(QString()); entry.displayIcon = symbolIcon(info.kind()); const Position &pos = info.range().start(); - entry.internalData = qVariantFromValue(Utils::LineColumn(pos.line(), pos.character())); + entry.internalData = QVariant::fromValue(Utils::LineColumn(pos.line(), pos.character())); return entry; } diff --git a/src/plugins/projectexplorer/currentprojectfind.cpp b/src/plugins/projectexplorer/currentprojectfind.cpp index 75aaf3e601..ca8093f78b 100644 --- a/src/plugins/projectexplorer/currentprojectfind.cpp +++ b/src/plugins/projectexplorer/currentprojectfind.cpp @@ -73,7 +73,7 @@ QVariant CurrentProjectFind::additionalParameters() const { Project *project = ProjectTree::currentProject(); if (project && project->document()) - return qVariantFromValue(project->projectFilePath().toString()); + return QVariant::fromValue(project->projectFilePath().toString()); return QVariant(); } diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp index 1da235b7fa..9bcde3a6eb 100644 --- a/src/plugins/projectexplorer/foldernavigationwidget.cpp +++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp @@ -482,7 +482,7 @@ void FolderNavigationWidget::insertRootDirectory( m_rootSelector->insertItem(index, directory.displayName); if (index <= previousIndex) // item was inserted, update previousIndex ++previousIndex; - m_rootSelector->setItemData(index, qVariantFromValue(directory.path), PATH_ROLE); + m_rootSelector->setItemData(index, QVariant::fromValue(directory.path), PATH_ROLE); m_rootSelector->setItemData(index, directory.id, ID_ROLE); m_rootSelector->setItemData(index, directory.sortValue, SORT_ROLE); m_rootSelector->setItemData(index, directory.path.toUserOutput(), Qt::ToolTipRole); diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp index e13dd041d4..324f4f7559 100644 --- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp +++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp @@ -79,7 +79,7 @@ QList<Core::LocatorFilterEntry> FunctionFilter::matchesFor( const QRegularExpressionMatch match = regexp.match(info.symbolName); if (match.hasMatch()) { - QVariant id = qVariantFromValue(info); + QVariant id = QVariant::fromValue(info); Core::LocatorFilterEntry filterEntry(this, info.displayName, id/*, info.icon*/); filterEntry.extraInfo = info.extraInfo; filterEntry.highlightInfo = highlightInfo(match); diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp index 5b22cc2cd4..4fe0ed97c4 100644 --- a/src/plugins/silversearcher/findinfilessilversearcher.cpp +++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp @@ -190,7 +190,7 @@ QVariant FindInFilesSilverSearcher::parameters() const { SilverSearcherSearchOptions silverSearcherSearchOptions; silverSearcherSearchOptions.searchOptions = m_searchOptionsLineEdit->text(); - return qVariantFromValue(silverSearcherSearchOptions); + return QVariant::fromValue(silverSearcherSearchOptions); } QString FindInFilesSilverSearcher::title() const diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index bdcc9ca5a5..89455023be 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -272,7 +272,7 @@ void BaseFileFind::runNewSearch(const QString &txt, FindFlags findFlags, parameters.additionalParameters = additionalParameters(); parameters.searchEngineParameters = currentSearchEngine()->parameters(); parameters.searchEngineIndex = d->m_currentSearchEngineIndex; - search->setUserData(qVariantFromValue(parameters)); + search->setUserData(QVariant::fromValue(parameters)); connect(search, &SearchResult::activated, this, [this, search](const SearchResultItem &item) { openEditor(search, item); }); diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index 92dae73d59..dfe390d68f 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -162,7 +162,7 @@ void BaseHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPoi Utils::ToolTip::show(point, m_toolTip, editorWidget, - qVariantFromValue(m_lastHelpItemIdentified)); + QVariant::fromValue(m_lastHelpItemIdentified)); } } // namespace TextEditor diff --git a/src/plugins/texteditor/findincurrentfile.cpp b/src/plugins/texteditor/findincurrentfile.cpp index 13cb63fa96..7c513d96bf 100644 --- a/src/plugins/texteditor/findincurrentfile.cpp +++ b/src/plugins/texteditor/findincurrentfile.cpp @@ -71,7 +71,7 @@ Utils::FileIterator *FindInCurrentFile::files(const QStringList &nameFilters, QVariant FindInCurrentFile::additionalParameters() const { - return qVariantFromValue(m_currentDocument->filePath().toString()); + return QVariant::fromValue(m_currentDocument->filePath().toString()); } QString FindInCurrentFile::label() const diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 38da20910f..080a1ec830 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -87,7 +87,7 @@ FileIterator *FindInFiles::files(const QStringList &nameFilters, QVariant FindInFiles::additionalParameters() const { - return qVariantFromValue(path().toString()); + return QVariant::fromValue(path().toString()); } QString FindInFiles::label() const diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index f8d2a87a06..2a0a0e35e6 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -979,11 +979,11 @@ void VcsBaseEditorWidget::contextMenuEvent(QContextMenuEvent *e) // the user has "Open With" and choose the right diff editor so that // fileNameFromDiffSpecification() works. QAction *applyAction = menu->addAction(tr("Apply Chunk...")); - applyAction->setData(qVariantFromValue(Internal::DiffChunkAction(chunk, false))); + applyAction->setData(QVariant::fromValue(Internal::DiffChunkAction(chunk, false))); connect(applyAction, &QAction::triggered, this, &VcsBaseEditorWidget::slotApplyDiffChunk); // Revert a chunk from a VCS diff, which might be linked to reloading the diff. QAction *revertAction = menu->addAction(tr("Revert Chunk...")); - revertAction->setData(qVariantFromValue(Internal::DiffChunkAction(chunk, true))); + revertAction->setData(QVariant::fromValue(Internal::DiffChunkAction(chunk, true))); connect(revertAction, &QAction::triggered, this, &VcsBaseEditorWidget::slotApplyDiffChunk); // Custom diff actions addDiffActions(menu, chunk); |