Adapt to removal of qMakePair and qVariantFromValue

Task-number: QTIFW-1829
Change-Id: I2291dee3c5bf0f10627f07e71624d7e669737f9a
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

2 files changed, 5 insertions, 5 deletions

diff --git a/src/libs/installer/remoteserverconnection.cpp b/src/libs/installer/remoteserverconnection.cpp
index 05446ec19..6131ff4dd 100644
--- a/src/libs/installer/remoteserverconnection.cpp
+++ b/src/libs/installer/remoteserverconnection.cpp
@@ -278,7 +278,7 @@ void RemoteServerConnection::handleQProcess(RemoteServerReply *reply, const QStr
 
         qint64 pid = -1;
         bool success = QInstaller::startDetached(program, arguments, workingDirectory, &pid);
-        reply->send(qMakePair< bool, qint64>(success, pid));
+        reply->send(QPair<bool, qint64>(success, pid));
     } else if (command == QLatin1String(Protocol::QProcessStartDetached2)) {
         QString program;
         QStringList arguments;
@@ -289,7 +289,7 @@ void RemoteServerConnection::handleQProcess(RemoteServerReply *reply, const QStr
 
         qint64 pid = -1;
         bool success = QProcess::startDetached(program, arguments, workingDirectory, &pid);
-        reply->send(qMakePair< bool, qint64>(success, pid));
+        reply->send(QPair<bool, qint64>(success, pid));
     } else if (command == QLatin1String(Protocol::QProcessSetWorkingDirectory)) {
         QString dir;
         data >> dir;
@@ -517,13 +517,13 @@ void RemoteServerConnection::handleQFSFileEngine(RemoteServerReply *reply, const
         data >> maxlen;
         QByteArray byteArray(maxlen, '\0');
         const qint64 r = m_engine->read(byteArray.data(), maxlen);
-        reply->send(qMakePair<qint64, QByteArray>(r, byteArray));
+        reply->send(QPair<qint64, QByteArray>(r, byteArray));
     } else if (command == QLatin1String(Protocol::QAbstractFileEngineReadLine)) {
         qint64 maxlen;
         data >> maxlen;
         QByteArray byteArray(maxlen, '\0');
         const qint64 r = m_engine->readLine(byteArray.data(), maxlen);
-        reply->send(qMakePair<qint64, QByteArray>(r, byteArray));
+        reply->send(QPair<qint64, QByteArray>(r, byteArray));
     } else if (command == QLatin1String(Protocol::QAbstractFileEngineRemove)) {
         reply->send(m_engine->remove());
     } else if (command == QLatin1String(Protocol::QAbstractFileEngineRename)) {
diff --git a/src/libs/kdtools/updateoperation.cpp b/src/libs/kdtools/updateoperation.cpp
index b35751096..9d1bd8230 100644
--- a/src/libs/kdtools/updateoperation.cpp
+++ b/src/libs/kdtools/updateoperation.cpp
@@ -650,7 +650,7 @@ bool UpdateOperation::fromXml(const QDomDocument &doc)
         const QString value = v.text();
 
         const QVariant::Type t = QVariant::nameToType(type.toLatin1().data());
-        QVariant var = qVariantFromValue(value);
+        QVariant var = QVariant::fromValue(value);
         if (t == QVariant::List || t == QVariant::StringList || !var.convert(t)) {
             QDataStream stream(QByteArray::fromBase64( value.toLatin1()));
             stream >> var;