From ee218192f6c25eba0c8f041ca2e53b7222881aa0 Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Wed, 18 Dec 2019 19:27:27 +0100 Subject: 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 --- src/base/QXmppGlobal.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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() { -- cgit v1.2.3