diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/QXmppGlobal.h.in | 4 | ||||
| -rw-r--r-- | src/base/QXmppUtils.cpp | 11 |
2 files changed, 12 insertions, 3 deletions
diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppGlobal.h.in index 7982f3b9..5f94196d 100644 --- a/src/base/QXmppGlobal.h.in +++ b/src/base/QXmppGlobal.h.in @@ -73,5 +73,9 @@ inline QLatin1String QXmppVersion() #define Q_DECL_ENUMERATOR_DEPRECATED_X(msg) #endif +#ifndef QT_WARNING_DISABLE_DEPRECATED +#define QT_WARNING_DISABLE_DEPRECATED +#endif + #endif // QXMPPGLOBAL_H diff --git a/src/base/QXmppUtils.cpp b/src/base/QXmppUtils.cpp index e17f95ec..3a858a30 100644 --- a/src/base/QXmppUtils.cpp +++ b/src/base/QXmppUtils.cpp @@ -126,8 +126,13 @@ QDateTime QXmppUtils::datetimeFromString(const QString &str) /// QString QXmppUtils::datetimeToString(const QDateTime &dt) { - if (dt.time().msec()) + if (dt.time().msec()) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) return dt.toUTC().toString(Qt::ISODateWithMs); +#else + return dt.toUTC().toString("yyyy-MM-ddTHH:mm:ss.zzzZ"); +#endif + } return dt.toUTC().toString(Qt::ISODate); } @@ -144,14 +149,14 @@ int QXmppUtils::timezoneOffsetFromString(const QString &str) return 0; // No offset from UTC - if (match.captured(1) == u'Z') + if (match.captured(1) == QChar(u'Z')) return 0; // Calculate offset const int offset = match.captured(3).toInt() * 3600 + match.captured(4).toInt() * 60; - if (match.captured(2) == u'-') + if (match.captured(2) == QChar(u'-')) return -offset; return offset; } |