From 735c673d8865e3abfe1d9505af5f107306bb82d3 Mon Sep 17 00:00:00 2001
From: ctrlaltca
Date: Thu, 17 Jul 2025 13:26:45 +0200
Subject: 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---
 src/modules/objects/KvsObject_painter.cpp         | 11 +++++++++++
 src/modules/objects/KvsObject_pixmap.cpp          | 13 +++++++++++++
 src/modules/objects/qthttp/qhttpauthenticator.cpp |  7 +++++++
 3 files changed, 31 insertions(+)

(limited to 'src/modules/objects')

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
-- 
cgit v1.3.1-10-gc9f91