diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:34:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-20 22:36:19 +0100 |
| commit | 65a97fccc67ae7f3df1900e1419955f939a49b9f (patch) | |
| tree | a8fd0e119b585123e77e3b2574f2d82a5474eb28 /src/dbus | |
| parent | 5e8bc07cb2ded1f5f74435411de666f419869514 (diff) | |
| parent | 1303327a713d8f88fd9782e4f887b646d4210f68 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
Change-Id: If089d5010d15c33b3c1f13912d4386207456c1a9
Diffstat (limited to 'src/dbus')
| -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 |
4 files changed, 16 insertions, 0 deletions
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 134cc78e57..023b3b1be2 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 0352978989..ca7adfaaeb 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; |