aboutsummaryrefslogtreecommitdiffstats
path: root/sources
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-06-22 13:49:35 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-06-22 16:11:24 +0200
commit7dfbccf4612f468a12154e02eb4ff47d58714e14 (patch)
treef03fe8c8cf274a05d05027d437a43104dd7f0478 /sources
parente8d13d590e75f78ddddb8cebfbb10bc42ce71b1e (diff)
PySide2/Qt 6: Fix warning about redefinition of QT_ANNOTATE_ACCESS_SPECIFIER
Move QT_ANNOTATE_ACCESS_SPECIFIER before first Qt include. Task-number: PYSIDE-904 Change-Id: I82b12a79174fad93e0c7ea260e5111b997c60995 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources')
-rw-r--r--sources/pyside2/PySide2/global.h.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/sources/pyside2/PySide2/global.h.in b/sources/pyside2/PySide2/global.h.in
index a8065a7ba..ae1b103f5 100644
--- a/sources/pyside2/PySide2/global.h.in
+++ b/sources/pyside2/PySide2/global.h.in
@@ -37,6 +37,9 @@
**
****************************************************************************/
+// Make "signals:", "slots:" visible as access specifiers
+#define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a)))
+
#include <QtCore/qnamespace.h>
#if @ENABLE_X11@
@@ -51,7 +54,4 @@
// not in release
#define QT_NO_DEBUG
-// Make "signals:", "slots:" visible as access specifiers
-#define QT_ANNOTATE_ACCESS_SPECIFIER(a) __attribute__((annotate(#a)))
-
// Here are now all configured modules appended: