diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-01-31 13:17:21 +0100 |
|---|---|---|
| committer | Jesús Fernández <jesus.fernandez@qt.io> | 2017-01-31 12:56:32 +0000 |
| commit | 7288759f544991bd8ea3571dd6132c008b1f45e9 (patch) | |
| tree | b01b4f9044994337195f1b063441431a713f8b51 /src/bluetoothsettings/bluez | |
| parent | cb97681ac8c88ebfc1543d4b1d5788f4db6b633b (diff) | |
Fix qmake warnings
Removes some "We mean it" and "QT_BEGIN_NAMESPACE" warnings.
Change-Id: Ia00b00e4e064814a1cb0dd2ca85a4bd888d58d26
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/bluetoothsettings/bluez')
| -rw-r--r-- | src/bluetoothsettings/bluez/bluetoothdevice_p.h | 11 | ||||
| -rw-r--r-- | src/bluetoothsettings/bluez/datatypes.h | 4 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.h b/src/bluetoothsettings/bluez/bluetoothdevice_p.h index 84d1382..f6892e3 100644 --- a/src/bluetoothsettings/bluez/bluetoothdevice_p.h +++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.h @@ -29,6 +29,17 @@ #ifndef BLUETOOTHDEVICE__P_H #define BLUETOOTHDEVICE__P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> class OrgBluezDevice1Interface; diff --git a/src/bluetoothsettings/bluez/datatypes.h b/src/bluetoothsettings/bluez/datatypes.h index e172378..9458dbe 100644 --- a/src/bluetoothsettings/bluez/datatypes.h +++ b/src/bluetoothsettings/bluez/datatypes.h @@ -36,9 +36,13 @@ #include <QtDBus/QDBusObjectPath> #include <QtCore/QMetaType> +QT_BEGIN_NAMESPACE + typedef QMap<QString, QVariantMap> InterfaceList; typedef QMap<QDBusObjectPath, InterfaceList> ManagedObjectList; +QT_END_NAMESPACE + Q_DECLARE_METATYPE(InterfaceList) Q_DECLARE_METATYPE(ManagedObjectList) |