diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2013-01-31 17:24:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-02 01:41:21 +0100 |
| commit | 3ba61d9baa569ea69e41a943981680c09c521ff7 (patch) | |
| tree | 5d9da1a7bc7a345d91b83ea8854e169ecf6006b1 /src/dbus/qdbusmessage.h | |
| parent | 2aa9f5d153ee9db1c904fdf98e814feb938e7bb2 (diff) | |
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 <Friedemann.Kleint@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus/qdbusmessage.h')
| -rw-r--r-- | src/dbus/qdbusmessage.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 |