diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:09:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 08:09:50 +0100 |
| commit | 80bf4bfe3df425962192118d4357acc144f6aef8 (patch) | |
| tree | 79e4b6a00d6bf68be62fe157878f38dcd782a475 /src/dbus/qdbusconnection.cpp | |
| parent | ac8a3b948da1980bc59bae3fc76d20b5b45662a0 (diff) | |
| parent | 8c2b4266002736da499d169a0da187e5cdc5381a (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: I0b190005377a23a91da3563428e223b8a3b18333
Diffstat (limited to 'src/dbus/qdbusconnection.cpp')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 |