From 4c9b06545afee50b84bfae7a27bbe3dd48cc749a Mon Sep 17 00:00:00 2001 From: Linus Jahn Date: Wed, 1 Apr 2020 16:36:38 +0200 Subject: Fix build with Qt 5.14 Q_DEPRECATED_X() can't be used on enum values anymore. The new Q_DECL_ENUMERATOR_DEPRECATED_X() can be uesd instead, this is only available since Qt 5.12, so I needed to define an empty fallback for it. --- src/base/QXmppStanza.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/base/QXmppStanza.h') diff --git a/src/base/QXmppStanza.h b/src/base/QXmppStanza.h index 8eb1b47a..9bbc9634 100644 --- a/src/base/QXmppStanza.h +++ b/src/base/QXmppStanza.h @@ -133,7 +133,7 @@ public: #if QXMPP_DEPRECATED_SINCE(1, 3) /// Payment is required to perform the request. /// \deprecated This error condition is deprecated since QXmpp 1.3 as it was not adopted in RFC6120. - QT_DEPRECATED_X("The error was removed in RFC6120") PaymentRequired, + PaymentRequired Q_DECL_ENUMERATOR_DEPRECATED_X("The error was removed in RFC6120"), #endif RecipientUnavailable = 12, ///< The recipient is unavailable. Redirect, ///< The requested resource is available elsewhere. This is used in combination with a redirection URI. -- cgit v1.2.3