Adapt to Qt 6.9 deprecations (#2706)

* Adapt to Qt 6.9 deprecations

* Windows 2019 images are no more available no github, switch to 2022

* Wordaround Qt5 missing QTimezone::UTC

6 files changed, 47 insertions, 3 deletions

diff --git a/.github/workflows/build_windows_qt5.yml b/.github/workflows/build_windows_qt5.yml
index 9906e42d2..4a7df2222 100644
--- a/.github/workflows/build_windows_qt5.yml
+++ b/.github/workflows/build_windows_qt5.yml
@@ -14,8 +14,8 @@ on:
 
 jobs:
   build-windows-qt5:
-    runs-on: windows-2019
-    # https://github.com/actions/runner-images/blob/main/images/windows/Windows2019-Readme.md
+    runs-on: windows-2022
+    # https://github.com/actions/runner-images/blob/main/images/windows/Windows2022-Readme.md
 
     steps:
       - name: Checkout
diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp
index 54257fc2f..3e6d30bcc 100644
--- a/src/kvirc/ui/KviIrcView_getTextLine.cpp
+++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp
@@ -38,8 +38,9 @@
 #include "KviTextIconManager.h"
 #include "KviWindow.h"
 
-#include <QDateTime>
 #include <QChar>
+#include <QDateTime>
+#include <QTimeZone>
 
 #define WSTRINGCONFIG_SAFE_TO_MEMCPY_QCHAR 1
 
@@ -196,7 +197,11 @@ const kvi_wchar_t * KviIrcView::getTextLine(
 		QDateTime datetime = datetime_param;
 		if(!datetime.isValid())
 			datetime = QDateTime::currentDateTime();
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 		datetime = datetime.toTimeSpec(KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? Qt::UTC : Qt::LocalTime);
+#else
+		datetime = datetime.toTimeZone(KVI_OPTION_BOOL(KviOption_boolIrcViewTimestampUTC) ? QTimeZone::UTC : QTimeZone::LocalTime);
+#endif
 		szTimestamp = datetime.toString(KVI_OPTION_STRING(KviOption_stringIrcViewTimestampFormat));
 		szTimestamp.append(' ');
 		int iTimeStampLength = szTimestamp.length();
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 5c576ae5c..6286d13da 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -1554,7 +1554,18 @@ KVSO_CLASS_FUNCTION(painter, drawPixmapMirrored)
 		sourceWH.setWidth(iW);
 		sourceWH.setHeight(iH);
 	}
+#if (QT_VERSION < QT_VERSION_CHECK(6, 9, 0))
 	QImage mirrored = pImage->mirrored(bHorizontal, bVertical);
+#else
+	Qt::Orientations orient = Qt::Orientations();
+	if(bHorizontal) {
+		orient |= Qt::Horizontal;
+	}
+	if(bVertical) {
+		orient |= Qt::Vertical;
+	}
+	QImage mirrored = pImage->flipped(orient);
+#endif
 	m_pPainter->drawImage(rX, rY, mirrored, sourceXY.x(), sourceXY.y(), sourceWH.width(), sourceWH.height());
 	return true;
 }
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index 15377194b..087594066 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -463,7 +463,20 @@ KVSO_CLASS_FUNCTION(pixmap, mirrored)
 		return false;
 	}
 	m_currentType = Image;
+
+#if (QT_VERSION < QT_VERSION_CHECK(6, 9, 0))
 	*m_pImage = m_pImage->mirrored(bHorizontal, bVertical);
+#else
+	Qt::Orientations orient = Qt::Orientations();
+	if(bHorizontal) {
+		orient |= Qt::Horizontal;
+	}
+	if(bVertical) {
+		orient |= Qt::Vertical;
+	}
+	*m_pImage = m_pImage->flipped(orient);
+#endif
+
 	return true;
 }
 
diff --git a/src/modules/objects/qthttp/qhttpauthenticator.cpp b/src/modules/objects/qthttp/qhttpauthenticator.cpp
index 2d256c6de..35ed15482 100644
--- a/src/modules/objects/qthttp/qhttpauthenticator.cpp
+++ b/src/modules/objects/qthttp/qhttpauthenticator.cpp
@@ -50,6 +50,7 @@
 #include <qendian.h>
 #include <qstring.h>
 #include <qdatetime.h>
+#include <QTimeZone>
 #include <QRandomGenerator>
 
 //#define NTLMV1_CLIENT
@@ -1308,8 +1309,14 @@ static QByteArray qEncodeNtlmv2Response(const QHttpAuthenticatorPrivate * ctx,
 	}
 	else
 	{
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
 		QDateTime currentTime(QDate::currentDate(),
 		    QTime::currentTime(), Qt::UTC);
+#else
+		QDateTime currentTime(QDate::currentDate(),
+		    QTime::currentTime(), QTimeZone::UTC);
+#endif
+
 
 		// number of seconds between 1601 and epoc(1970)
 		// 369 years, 89 leap years
diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp
index 50035138d..c08c85a11 100644
--- a/src/modules/upnp/Service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -242,7 +242,15 @@ namespace UPnP
 
 		// Parse the XML
 		QString errorMessage;
+#if (QT_VERSION < QT_VERSION_CHECK(6, 9, 0))
 		bool error = !xml.setContent(response, false, &errorMessage);
+#else
+		auto result = xml.setContent(response, QDomDocument::ParseOption::Default);
+		bool error = !(bool)result;
+		if(error) {
+			errorMessage = result.errorMessage;
+		}
+#endif
 
 		if(!error)
 		{