diff options
| author | Jeremy Rimpo <jrim@rimpo.org> | 2020-01-07 11:55:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-07 11:55:13 -0600 |
| commit | f37ec77b2624fb4a41acf89ea7d12d9dc6ffa08d (patch) | |
| tree | 6ef1a4d7d0c5f659149ca1b6d8ff291f2cbcebe3 /src/mainwindow.cpp | |
| parent | d1a788dfad341b32235abc25c2ba1645f8be1ace (diff) | |
| parent | 81abbacd6746b89a8b83f59e420fc0d3d7885912 (diff) | |
Merge pull request #959 from ModOrganizer2/qt-5-14
Qt 5 14
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 5da42b93..be8eaef8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1434,7 +1434,7 @@ void MainWindow::displaySaveGameInfo(QListWidgetItem *newItem) m_CurrentSaveView->move(pos); m_CurrentSaveView->show(); - m_CurrentSaveView->setProperty("displayItem", qVariantFromValue(static_cast<void *>(newItem))); + m_CurrentSaveView->setProperty("displayItem", QVariant::fromValue(static_cast<void *>(newItem))); } @@ -1507,7 +1507,7 @@ void MainWindow::registerPluginTool(IPluginTool *tool, QString name, QMenu *menu QAction *action = new QAction(tool->icon(), name, menu); action->setToolTip(tool->tooltip()); tool->setParentWidget(this); - action->setData(qVariantFromValue((QObject*)tool)); + action->setData(QVariant::fromValue((QObject*)tool)); connect(action, SIGNAL(triggered()), this, SLOT(toolPluginInvoke()), Qt::QueuedConnection); menu->addAction(action); @@ -1567,7 +1567,7 @@ void MainWindow::registerModPage(IPluginModPage *modPage) QAction *action = new QAction(modPage->icon(), modPage->displayName(), this); modPage->setParentWidget(this); - action->setData(qVariantFromValue(reinterpret_cast<QObject*>(modPage))); + action->setData(QVariant::fromValue(reinterpret_cast<QObject*>(modPage))); connect(action, SIGNAL(triggered()), this, SLOT(modPagePluginInvoke()), Qt::QueuedConnection); |
