From 3ba61d9baa569ea69e41a943981680c09c521ff7 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 31 Jan 2013 17:24:50 +0100 Subject: fix build failures on mingw caused by name clash In mingw.org, basetyps.h contains #define interface _COM_interface which clashes with function parameter names in qdbusmessage.h. Although there is no clash when building qtbase itself, the clash makes building qttools 5.0.1 fail. Presumably this could also affect other applications. Taken from 2cc9a9a51d6742708b1ea41c7338755e2a0ee9e9 which solves the same problem in another header. Change-Id: I802d5c673b544fb3a17e9273030876928faa5c46 Reviewed-by: Friedemann Kleint Reviewed-by: Thiago Macieira --- src/dbus/qdbusmessage.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/dbus') diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 8560440881..72caf312ec 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -49,6 +49,10 @@ #ifndef QT_NO_DBUS +#if defined(Q_OS_WIN) && defined(interface) +# undef interface +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -- cgit v1.2.3