Handle api removed in Qt6

Task-number: QTIFW-1829
Change-Id: Ibb492ada102dd74f4defde084fca48106837add6
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Reviewed-by: Katja Marttila <katja.marttila@qt.io>

7 files changed, 40 insertions, 6 deletions

diff --git a/src/libs/installer/link.cpp b/src/libs/installer/link.cpp
index ff9f49696..027dac232 100644
--- a/src/libs/installer/link.cpp
+++ b/src/libs/installer/link.cpp
@@ -263,7 +263,7 @@ QString Link::targetPath() const
 #ifdef Q_OS_WIN
     return readWindowsSymLink(m_path);
 #else
-    return QFileInfo(m_path).readLink();
+    return QFileInfo(m_path).symLinkTarget();
 #endif
 }
 
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index b2d989946..9db6e6eeb 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -80,13 +80,15 @@
 #include <QShowEvent>
 #include <QFileDialog>
 #include <QGroupBox>
-#include <QDesktopWidget>
+#include <QScreen>
 
 #ifdef Q_OS_WIN
 # include <qt_windows.h>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 # include <QWinTaskbarButton>
 # include <QWinTaskbarProgress>
 #endif
+#endif
 
 using namespace KDUpdater;
 using namespace QInstaller;
@@ -451,7 +453,7 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent)
 */
 void PackageManagerGui::setMaxSize()
 {
-    QSize size = qApp->desktop()->availableGeometry(this).size();
+    QSize size = this->screen()->availableGeometry().size();
     int windowFrameHeight = frameGeometry().height() - geometry().height();
     int availableHeight = size.height() - windowFrameHeight;
 
@@ -1549,6 +1551,7 @@ IntroductionPage::IntroductionPage(PackageManagerCore *core)
     m_updateComponents->setEnabled(!m_offlineMaintenanceTool && ProductKeyCheck::instance()->hasValidKey());
 
 #ifdef Q_OS_WIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) {
         m_taskButton = new QWinTaskbarButton(this);
         connect(core, &PackageManagerCore::metaJobProgress,
@@ -1557,6 +1560,7 @@ IntroductionPage::IntroductionPage(PackageManagerCore *core)
         m_taskButton = nullptr;
     }
 #endif
+#endif
 }
 
 /*!
@@ -1602,6 +1606,7 @@ bool IntroductionPage::validatePage()
     }
 
 #ifdef Q_OS_WIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0 ,0)
     if (m_taskButton) {
         if (!m_taskButton->window()) {
             if (QWidget *widget = QApplication::activeWindow())
@@ -1613,6 +1618,7 @@ bool IntroductionPage::validatePage()
         m_taskButton->progress()->setVisible(true);
     }
 #endif
+#endif
 
     // fetch updater packages
     if (core->isUpdater()) {
@@ -1677,9 +1683,11 @@ bool IntroductionPage::validatePage()
     gui()->setSettingsButtonEnabled(true);
 
 #ifdef Q_OS_WIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     if (m_taskButton)
         m_taskButton->progress()->setVisible(!isComplete());
 #endif
+#endif
     return isComplete();
 }
 
@@ -1800,11 +1808,13 @@ void IntroductionPage::setErrorMessage(const QString &error)
     m_errorLabel->setPalette(palette);
 
 #ifdef Q_OS_WIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     if (m_taskButton) {
         m_taskButton->progress()->stop();
         m_taskButton->progress()->setValue(100);
     }
 #endif
+#endif
 }
 
 /*!
diff --git a/src/libs/installer/performinstallationform.cpp b/src/libs/installer/performinstallationform.cpp
index d8d1e3dcb..0e4c561f6 100644
--- a/src/libs/installer/performinstallationform.cpp
+++ b/src/libs/installer/performinstallationform.cpp
@@ -49,9 +49,11 @@
 #include <QtCore/QTimer>
 
 #ifdef Q_OS_WIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 # include <QWinTaskbarButton>
 # include <QWinTaskbarProgress>
 #endif
+#endif
 
 using namespace QInstaller;
 
@@ -96,6 +98,7 @@ PerformInstallationForm::PerformInstallationForm(PackageManagerCore *core, QObje
     , m_core(core)
 {
 #ifdef Q_OS_WIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) {
         m_taskButton = new QWinTaskbarButton(this);
         m_taskButton->progress()->setVisible(true);
@@ -103,6 +106,7 @@ PerformInstallationForm::PerformInstallationForm(PackageManagerCore *core, QObje
         m_taskButton = nullptr;
     }
 #endif
+#endif
 }
 
 /*!
@@ -204,12 +208,14 @@ void PerformInstallationForm::updateProgress()
 
     m_progressBar->setValue(progressPercentage);
 #ifdef Q_OS_WIN
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     if (m_taskButton) {
         if (!m_taskButton->window() && QApplication::activeWindow())
             m_taskButton->setWindow(QApplication::activeWindow()->windowHandle());
         m_taskButton->progress()->setValue(progressPercentage);
     }
 #endif
+#endif
 
     static QString lastLabelText;
     if (lastLabelText == progressCoordninator->labelText())
diff --git a/src/libs/installer/permissionsettings.cpp b/src/libs/installer/permissionsettings.cpp
index 235c6667b..68e4ab427 100644
--- a/src/libs/installer/permissionsettings.cpp
+++ b/src/libs/installer/permissionsettings.cpp
@@ -40,25 +40,33 @@ using namespace QInstaller;
 PermissionSettings::PermissionSettings(const QString &organization, const QString &application, QObject *parent)
     : QSettings(organization, application, parent)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     setIniCodec("UTF-8"); // to workaround QTBUG-102334
+#endif
 }
 
 PermissionSettings::PermissionSettings(Scope scope, const QString &organization, const QString &application, QObject *parent)
     : QSettings(scope, organization, application, parent)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     setIniCodec("UTF-8"); // QTBUG-102334
+#endif
 }
 
 PermissionSettings::PermissionSettings(Format format, Scope scope, const QString &organization, const QString &application, QObject *parent)
     : QSettings(format, scope, organization, application, parent)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     setIniCodec("UTF-8"); // QTBUG-102334
+#endif
 }
 
 PermissionSettings::PermissionSettings(const QString &fileName, Format format, QObject *parent)
     : QSettings(fileName, format, parent)
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     setIniCodec("UTF-8"); // QTBUG-102334
+#endif
 }
 
 PermissionSettings::~PermissionSettings()
diff --git a/src/libs/installer/repository.cpp b/src/libs/installer/repository.cpp
index ddbf3b382..e8df4e433 100644
--- a/src/libs/installer/repository.cpp
+++ b/src/libs/installer/repository.cpp
@@ -270,7 +270,9 @@ const Repository &Repository::operator=(const Repository &other)
 void Repository::registerMetaType()
 {
     qRegisterMetaType<Repository>("Repository");
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     qRegisterMetaTypeStreamOperators<Repository>("Repository");
+#endif
 }
 
 /*!
diff --git a/src/libs/installer/repositorycategory.cpp b/src/libs/installer/repositorycategory.cpp
index e651b7f0c..6be292330 100644
--- a/src/libs/installer/repositorycategory.cpp
+++ b/src/libs/installer/repositorycategory.cpp
@@ -75,7 +75,9 @@ RepositoryCategory::RepositoryCategory(const RepositoryCategory &other)
 void RepositoryCategory::registerMetaType()
 {
     qRegisterMetaType<RepositoryCategory>("RepositoryCategory");
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     qRegisterMetaTypeStreamOperators<RepositoryCategory>("RepositoryCategory");
+#endif
 }
 
 /*!
diff --git a/src/libs/kdtools/kdsysinfo_win.cpp b/src/libs/kdtools/kdsysinfo_win.cpp
index 465029252..d423ef01e 100644
--- a/src/libs/kdtools/kdsysinfo_win.cpp
+++ b/src/libs/kdtools/kdsysinfo_win.cpp
@@ -66,7 +66,13 @@ QList<ProcessInfo> runningProcesses()
     QStringList deviceList;
     const DWORD bufferSize = 1024;
     char buffer[bufferSize + 1] = { 0 };
-    if (QSysInfo::windowsVersion() <= QSysInfo::WV_5_2) {
+
+    // Qt6 does not support Win before 10
+    bool winVerLessEqual5_2 = false;
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+    winVerLessEqual5_2 = QSysInfo::windowsVersion() <= QSysInfo::WV_5_2;
+#endif
+    if (winVerLessEqual5_2) {
         const DWORD size = GetLogicalDriveStringsA(bufferSize, buffer);
         deviceList = QString::fromLatin1(buffer, size).split(QLatin1Char(char(0)), Qt::SkipEmptyParts);
     }
@@ -85,7 +91,7 @@ QList<ProcessInfo> runningProcesses()
     processStruct.dwSize = sizeof(PROCESSENTRY32);
     bool foundProcess = Process32First(snapshot, &processStruct);
     while (foundProcess) {
-        HANDLE procHandle = OpenProcess(QSysInfo::windowsVersion() > QSysInfo::WV_5_2
+        HANDLE procHandle = OpenProcess(!winVerLessEqual5_2
             ? KDSYSINFO_PROCESS_QUERY_LIMITED_INFORMATION : PROCESS_QUERY_INFORMATION, false, processStruct
                 .th32ProcessID);
 
@@ -93,7 +99,7 @@ QList<ProcessInfo> runningProcesses()
         QString executablePath;
         DWORD bufferSize = 1024;
 
-        if (QSysInfo::windowsVersion() > QSysInfo::WV_5_2) {
+        if (!winVerLessEqual5_2) {
             succ = pQueryFullProcessImageNamePtr(procHandle, 0, buffer, &bufferSize);
             executablePath = QString::fromLatin1(buffer);
         } else if (pGetProcessImageFileNamePtr) {