diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2022-10-20 09:55:23 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2022-12-29 12:50:50 +0000 |
| commit | 504814efafb0a0a5e8baf141462e4852b1ad1c30 (patch) | |
| tree | 56e762ac740349f2ba26f1141e1319541ec3e441 /src/libs/installer/performinstallationform.cpp | |
| parent | 1793bdb094b68b7ad38cedb7ff887517ce5a5f10 (diff) | |
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>
Diffstat (limited to 'src/libs/installer/performinstallationform.cpp')
| -rw-r--r-- | src/libs/installer/performinstallationform.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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()) |