diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2016-02-03 11:53:57 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2016-02-05 04:14:28 +0000 |
| commit | 786d23bb4966b6697ac04c43158e2312d898e133 (patch) | |
| tree | fc5c8736dad4db6604eaae5b03aafb34faa95086 | |
| parent | d482805856a83f39fdab32c76f10cf7d7d5e2112 (diff) | |
Fix dbus wince build
interface is a define under wince. This define is included even
with standard header includes already. It needs to be undefined
for using it.
Task-number: QTBUG-50853
Change-Id: Ie44681f03709848e9747a8aec11835c8d62aa409
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/dbus/qdbusabstractinterface.h | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 4 | ||||
| -rw-r--r-- | src/dbus/qdbusintegrator.cpp | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index 5336dfba38..16071df956 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -43,6 +43,10 @@ #include <QtDBus/qdbusextratypes.h> #include <QtDBus/qdbusconnection.h> +#ifdef interface +#undef interface +#endif + #ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 0f2d799b92..7f44272bc3 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -54,6 +54,10 @@ #include <algorithm> +#ifdef interface +#undef interface +#endif + #ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp index ebf42b0b06..cd448613d6 100644 --- a/src/dbus/qdbusintegrator.cpp +++ b/src/dbus/qdbusintegrator.cpp @@ -63,6 +63,9 @@ #include "qdbusthreaddebug_p.h" #include <algorithm> +#ifdef interface +#undef interface +#endif #ifndef QT_NO_DBUS |