diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/objects/KvsObject_painter.cpp | 11 | ||||
| -rw-r--r-- | src/modules/objects/KvsObject_pixmap.cpp | 13 | ||||
| -rw-r--r-- | src/modules/objects/qthttp/qhttpauthenticator.cpp | 7 | ||||
| -rw-r--r-- | src/modules/upnp/Service.cpp | 8 |
4 files changed, 39 insertions, 0 deletions
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) { |