diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-30 17:53:06 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-09-15 02:08:50 +0000 |
| commit | f744aece9df792fdc63593b5bd749ad69dfbd9c1 (patch) | |
| tree | 451bdaea8b456f27246ece378164b60c4929c9e6 /src/dbus/qdbusservicewatcher.h | |
| parent | 186d8814407ccb3e221537d9797172c37127bc51 (diff) | |
QDBusServiceWatcher: Move the logic to QDBusConnectionPrivate
With kdbus, we won't have a regular signal, but instead a special
message. So keep the logic of what to do in QDBusConnectionPrivate.
The #ifdef is to make sure the bootstrapped qdbuscpp2xml continues to
build in cross-compilation environments.
Change-Id: Iee8cbc07c4434ce9b560ffff13d06f0d9904cb6d
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/dbus/qdbusservicewatcher.h')
| -rw-r--r-- | src/dbus/qdbusservicewatcher.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index 6f6ce917af..71c0f0af68 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -37,7 +37,7 @@ #include <QtCore/qobject.h> #include <QtDBus/qdbusmacros.h> -#ifndef QT_NO_DBUS +#if !defined(QT_NO_DBUS) && !defined(QT_NO_QOBJECT) QT_BEGIN_NAMESPACE @@ -89,5 +89,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusServiceWatcher::WatchMode) QT_END_NAMESPACE -#endif // QT_NO_DBUS +#endif // QT_NO_DBUS || QT_NO_QOBJECT #endif // QDBUSSERVICEWATCHER_H |