Adapt to differences between Qt5 and Qt6

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

10 files changed, 12 insertions, 12 deletions

diff --git a/src/libs/3rdparty/7zip/unix/CPP/myWindows/myCommandLineParser.cpp b/src/libs/3rdparty/7zip/unix/CPP/myWindows/myCommandLineParser.cpp
index 37f4fe991..e101db855 100644
--- a/src/libs/3rdparty/7zip/unix/CPP/myWindows/myCommandLineParser.cpp
+++ b/src/libs/3rdparty/7zip/unix/CPP/myWindows/myCommandLineParser.cpp
@@ -37,7 +37,7 @@ void SplitCommandLine(const UString &s, UStringVector &parts)
     parts.Clear();
 
     const QString cmdLine = QString::fromStdWString(static_cast<const wchar_t*>(s));
-    const QStringList args = cmdLine.simplified().split(QLatin1Char(' '), QString::SkipEmptyParts);
+    const QStringList args = cmdLine.simplified().split(QLatin1Char(' '), Qt::SkipEmptyParts);
     foreach (const QString &arg, args)
         parts.Add(arg.toStdWString().c_str());
 }
diff --git a/src/libs/installer/component_p.cpp b/src/libs/installer/component_p.cpp
index 42a4c5277..7cf47c925 100644
--- a/src/libs/installer/component_p.cpp
+++ b/src/libs/installer/component_p.cpp
@@ -153,7 +153,7 @@ void ComponentModelHelper::setEnabled(bool enabled)
 */
 bool ComponentModelHelper::isTristate() const
 {
-    return (flags() & Qt::ItemIsTristate) != 0;
+    return (flags() & Qt::ItemIsAutoTristate) != 0;
 }
 
 /*!
@@ -164,7 +164,7 @@ bool ComponentModelHelper::isTristate() const
 */
 void ComponentModelHelper::setTristate(bool tristate)
 {
-    changeFlags(tristate, Qt::ItemIsTristate);
+    changeFlags(tristate, Qt::ItemIsAutoTristate);
 }
 
 /*!
diff --git a/src/libs/installer/createdesktopentryoperation.cpp b/src/libs/installer/createdesktopentryoperation.cpp
index 6c92cc178..c3988a8ec 100644
--- a/src/libs/installer/createdesktopentryoperation.cpp
+++ b/src/libs/installer/createdesktopentryoperation.cpp
@@ -158,7 +158,7 @@ bool CreateDesktopEntryOperation::performOperation()
     // Type=Application\nExec=qtcreator\nPath=...
     const QStringList pairs = values.split(QLatin1Char('\n'));
     for (QStringList::const_iterator it = pairs.begin(); it != pairs.end(); ++it)
-        stream << *it << endl;
+        stream << *it << Qt::endl;
 
     return true;
 }
diff --git a/src/libs/installer/loggingutils.cpp b/src/libs/installer/loggingutils.cpp
index 189a1d050..f1c638bbf 100644
--- a/src/libs/installer/loggingutils.cpp
+++ b/src/libs/installer/loggingutils.cpp
@@ -442,7 +442,7 @@ VerboseWriter *VerboseWriter::instance()
 */
 void VerboseWriter::appendLine(const QString &msg)
 {
-    m_stream << msg << endl;
+    m_stream << msg << Qt::endl;
 }
 
 /*!
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 5100c62ed..2a670f72d 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -4425,8 +4425,8 @@ void PackageManagerCore::createAutoTreeNames(QHash<QString, Component *> &compon
             if (!(parent && parent->treeNameMoveChildren()))
                 continue; // TreeName only applied to parent
 
-            if (newName.split(QLatin1Char('.'), QString::SkipEmptyParts).count()
-                    > name.split(QLatin1Char('.'), QString::SkipEmptyParts).count()) {
+            if (newName.split(QLatin1Char('.'), Qt::SkipEmptyParts).count()
+                    > name.split(QLatin1Char('.'), Qt::SkipEmptyParts).count()) {
                 continue;
             }
             newName = name;
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 721e0d867..759ea6bf3 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -964,7 +964,7 @@ void PackageManagerCorePrivate::readMaintenanceConfigFiles(const QString &target
             case QXmlStreamReader::StartElement: {
                 if (reader.name() == QLatin1String("Network")) {
                     while (reader.readNextStartElement()) {
-                        const QStringRef name = reader.name();
+                        const QStringView name = reader.name();
                         if (name == QLatin1String("Ftp")) {
                             m_data.settings().setFtpProxy(readProxy(reader));
                         } else if (name == QLatin1String("Http")) {
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp
index ff246cb71..1d5b9f713 100644
--- a/src/libs/installer/packagemanagercoredata.cpp
+++ b/src/libs/installer/packagemanagercoredata.cpp
@@ -293,7 +293,7 @@ QString PackageManagerCoreData::replaceVariables(const QString &str) const
 
 QByteArray PackageManagerCoreData::replaceVariables(const QByteArray &ba) const
 {
-    static const QChar at = QLatin1Char('@');
+    static const char at = '@';
     QByteArray res;
     int pos = 0;
     while (true) {
diff --git a/src/libs/installer/qprocesswrapper.cpp b/src/libs/installer/qprocesswrapper.cpp
index f37d65b29..f4c481af2 100644
--- a/src/libs/installer/qprocesswrapper.cpp
+++ b/src/libs/installer/qprocesswrapper.cpp
@@ -356,7 +356,7 @@ void QProcessWrapper::start(const QString &param1, QIODevice::OpenMode param2)
         callRemoteMethod(QLatin1String(Protocol::QProcessStart2Arg), param1, param2);
         m_lock.unlock();
     } else {
-        process.start(param1, param2);
+        process.start(param1, {}, param2);
     }
 }
 
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp
index 3b2e3ae1d..bcd475d54 100644
--- a/src/libs/installer/scriptengine.cpp
+++ b/src/libs/installer/scriptengine.cpp
@@ -657,7 +657,7 @@ QJSValue ScriptEngine::generateDesktopServicesObject()
     SETPROPERTY(desktopServices, PicturesLocation, QStandardPaths)
     SETPROPERTY(desktopServices, TempLocation, QStandardPaths)
     SETPROPERTY(desktopServices, HomeLocation, QStandardPaths)
-    SETPROPERTY(desktopServices, DataLocation, QStandardPaths)
+    SETPROPERTY(desktopServices, AppDataLocation, QStandardPaths)
     SETPROPERTY(desktopServices, CacheLocation, QStandardPaths)
     SETPROPERTY(desktopServices, GenericDataLocation, QStandardPaths)
     SETPROPERTY(desktopServices, RuntimeLocation, QStandardPaths)
diff --git a/src/libs/installer/utils.cpp b/src/libs/installer/utils.cpp
index f677ba5f0..154a66553 100644
--- a/src/libs/installer/utils.cpp
+++ b/src/libs/installer/utils.cpp
@@ -57,7 +57,7 @@
 */
 void QInstaller::uiDetachedWait(int ms)
 {
-    QTime timer;
+    QElapsedTimer timer;
     timer.start();
     do {
         QCoreApplication::processEvents(QEventLoop::AllEvents, ms);