diff options
| -rw-r--r-- | src/corelib/thread/qfutureinterface.cpp | 4 | ||||
| -rw-r--r-- | src/dbus/qdbus_symbols_p.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusabstractadaptor_p.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusconnection.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusmetaobject_p.h | 4 |
5 files changed, 20 insertions, 0 deletions
diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index c62b8fd36b..9db33c3af2 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -48,6 +48,10 @@ #include <QtCore/qthread.h> #include <private/qthreadpool_p.h> +#ifdef interface +# undef interface +#endif + QT_BEGIN_NAMESPACE enum { diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h index cfc0e12046..9eaebe6d7e 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -63,6 +63,10 @@ # include "dbus_minimal_p.h" #endif +#ifdef interface +# undef interface +#endif + QT_BEGIN_NAMESPACE #if !defined QT_LINKED_LIBDBUS diff --git a/src/dbus/qdbusabstractadaptor_p.h b/src/dbus/qdbusabstractadaptor_p.h index ed28777734..fb185cfb16 100644 --- a/src/dbus/qdbusabstractadaptor_p.h +++ b/src/dbus/qdbusabstractadaptor_p.h @@ -67,6 +67,10 @@ #ifndef QT_NO_DBUS +#ifdef interface +# undef interface +#endif + QT_BEGIN_NAMESPACE class QDBusAbstractAdaptor; diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index ba28938b60..f801d6225c 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -47,6 +47,10 @@ #ifndef QT_NO_DBUS +#ifdef interface +# undef interface +#endif + QT_BEGIN_NAMESPACE diff --git a/src/dbus/qdbusmetaobject_p.h b/src/dbus/qdbusmetaobject_p.h index 599358634b..89fccf9046 100644 --- a/src/dbus/qdbusmetaobject_p.h +++ b/src/dbus/qdbusmetaobject_p.h @@ -57,6 +57,10 @@ #ifndef QT_NO_DBUS +#ifdef interface +# undef interface +#endif + QT_BEGIN_NAMESPACE class QDBusError; |