diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-08-03 14:33:43 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-08-04 12:29:08 (GMT) |
| commit | f2b5d057252870a3d6c1cf24e848a740c697ea99 (patch) | |
| tree | 4ab665919b794d9cbbf8ec341fb87204e0efe462 /src/plugins/bearer | |
| parent | 64ed30abf62bff401f391272f3c96453c26942b1 (diff) | |
| download | Qt-f2b5d057252870a3d6c1cf24e848a740c697ea99.zip Qt-f2b5d057252870a3d6c1cf24e848a740c697ea99.tar.gz Qt-f2b5d057252870a3d6c1cf24e848a740c697ea99.tar.bz2 | |
Fix compilation with QT_NO_DBUS
Merge-request: 2441
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins/bearer')
| -rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/bearer/connman/qconnmanservice_linux_p.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index 00cfb31..eb88317 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -53,6 +53,8 @@ #include "qconnmanservice_linux_p.h" +#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE static QDBusConnection dbusConnection = QDBusConnection::systemBus(); @@ -1169,3 +1171,7 @@ void QConnmanDBusHelper::propertyChanged(const QString &item, const QDBusVariant ///////////////// QT_END_NAMESPACE + +#endif // QT_NO_DBUS +#endif // QT_NO_BEARERMANAGEMENT + diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h index 18233b0..a2b1e73 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h +++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h @@ -65,6 +65,9 @@ #include <QtDBus/QDBusContext> #include <QMap> +#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_DBUS + #ifndef __CONNMAN_DBUS_H #define CONNMAN_SERVICE "org.moblin.connman" @@ -385,4 +388,7 @@ Q_SIGNALS: QT_END_NAMESPACE +#endif // QT_NO_DBUS +#endif // QT_NO_BEARERMANAGEMENT + #endif //QCONNMANSERVICE_H |