Merge pull request #959 from ModOrganizer2/qt-5-14

Qt 5 14

4 files changed, 9 insertions, 7 deletions

diff --git a/src/dlls.manifest.qt5 b/src/dlls.manifest.qt5
index 88843b77..cae74df1 100644
--- a/src/dlls.manifest.qt5
+++ b/src/dlls.manifest.qt5
@@ -14,11 +14,13 @@
   <file name="Qt5Positioning.dll"/>

   <file name="Qt5PrintSupport.dll"/>

   <file name="Qt5Qml.dll"/>

+  <file name="Qt5QmlModels.dll"/>

+  <file name="Qt5QmlWorkerScript.dll"/>

   <file name="Qt5Quick.dll"/>

   <file name="Qt5QuickWidgets.dll"/>

-  <file name="Qt5WebChannel.dll"/>

   <file name="Qt5SerialPort.dll"/>

   <file name="Qt5Svg.dll"/>

+  <file name="Qt5WebChannel.dll"/>

   <file name="Qt5WebEngineCore.dll"/>

   <file name="Qt5WebEngineWidgets.dll"/>

   <file name="Qt5WebSockets.dll"/>

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index adfbc84d..8b644b8c 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -639,7 +639,7 @@ void DownloadManager::addNXMDownload(const QString &url)
   info->nexusDownloadUser = nxmInfo.userId();
 
   QObject *test = info;
-  m_RequestIDs.insert(m_NexusInterface->requestFileInfo(foundGame->gameShortName(), nxmInfo.modId(), nxmInfo.fileId(), this, qVariantFromValue(test), ""));
+  m_RequestIDs.insert(m_NexusInterface->requestFileInfo(foundGame->gameShortName(), nxmInfo.modId(), nxmInfo.fileId(), this, QVariant::fromValue(test), ""));
 }
 
 
@@ -1690,7 +1690,7 @@ void DownloadManager::nxmFileInfoAvailable(QString gameName, int modID, int file
   info->fileID = fileID;
 
   QObject *test = info;
-  m_RequestIDs.insert(m_NexusInterface->requestDownloadURL(info->gameName, info->modID, info->fileID, this, qVariantFromValue(test), QString()));
+  m_RequestIDs.insert(m_NexusInterface->requestDownloadURL(info->gameName, info->modID, info->fileID, this, QVariant::fromValue(test), QString()));
 }
 
 static int evaluateFileInfoMap(
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);
 
diff --git a/src/problemsdialog.cpp b/src/problemsdialog.cpp
index ea23beec..4b944ed2 100644
--- a/src/problemsdialog.cpp
+++ b/src/problemsdialog.cpp
@@ -61,7 +61,7 @@ void ProblemsDialog::runDiagnosis()
       if (diagnose->hasGuidedFix(key)) {

         newItem->setText(1, tr("Fix"));

         QPushButton *fixButton = new QPushButton(tr("Fix"));

-        fixButton->setProperty("fix", qVariantFromValue(reinterpret_cast<void*>(diagnose)));

+        fixButton->setProperty("fix", QVariant::fromValue(reinterpret_cast<void*>(diagnose)));

         fixButton->setProperty("key", key);

         connect(fixButton, SIGNAL(clicked()), this, SLOT(startFix()));

         ui->problemsWidget->setItemWidget(newItem, 1, fixButton);