aboutsummaryrefslogtreecommitdiff
path: root/src/base
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2019-12-18 19:27:27 +0100
committerLNJ <lnj@kaidan.im>2019-12-18 20:03:24 +0100
commitee218192f6c25eba0c8f041ca2e53b7222881aa0 (patch)
tree71322ab427ba619b146001ed55ae92effccbe3e3 /src/base
parent4d61ddd55f5a1a9b51a154c8493e61237827c212 (diff)
downloadqxmpp-ee218192f6c25eba0c8f041ca2e53b7222881aa0.tar.gz
QXmppGlobal: Use QT_VERSION_CHECK() to generate QXMPP_VERSION
QT_VERSION_CHECK() returns the same format as is currently used, it is easier to read and fixes a problem that could occur with the previous marco. The macro was unenclosed causing comparison to fail. This also happened in Kaidan [1]. [1]: https://invent.kde.org/kde/kaidan/commit/5a3e5e8a748488f4d55302b4beacce880dde381a
Diffstat (limited to 'src/base')
-rw-r--r--src/base/QXmppGlobal.h.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppGlobal.h.in
index 992e02b1..2154f40e 100644
--- a/src/base/QXmppGlobal.h.in
+++ b/src/base/QXmppGlobal.h.in
@@ -46,7 +46,7 @@
/// available.
///
-#define QXMPP_VERSION (0x@VERSION_MAJOR@ << 16) | (0x@VERSION_MINOR@ << 8) | 0x@VERSION_PATCH@
+#define QXMPP_VERSION QT_VERSION_CHECK(@VERSION_MAJOR@, @VERSION_MINOR@, @VERSION_PATCH@)
inline QLatin1String QXmppVersion()
{