diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2017-03-24 11:20:14 +0100 |
|---|---|---|
| committer | Lars Schmertmann <lars.schmertmann@governikus.de> | 2017-03-30 06:12:20 +0000 |
| commit | 61de2a96250ec140233b96f81b1bbb015dad48dc (patch) | |
| tree | aa95b7289adc4ea73f814ea05be05ebd2d023bee /src | |
| parent | 3490bc836925f34608a876ba2e94a073c5b38798 (diff) | |
Register additional meta types
Register QLowEnergyCharacteristic and QLowEnergyDescriptor
as meta types because they are used in signals.
[ChangeLog][QtBluetooth] Register QLowEnergyCharacteristic
and QLowEnergyDescriptor as meta types. It is therefore
necessary to declare them as meta types in the header files.
This commit will cause conflicts with existing meta type
declarations in applications using Qt. These declarations
need to be removed.
Change-Id: I18f33b1b2f159cffd6efbacc37178286b86a06e0
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/osx/osxbtcentralmanager.mm | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycharacteristic.h | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_p.h | 5 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergydescriptor.h | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergyservice.cpp | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/src/bluetooth/osx/osxbtcentralmanager.mm b/src/bluetooth/osx/osxbtcentralmanager.mm index f7218ca6..c8eee733 100644 --- a/src/bluetooth/osx/osxbtcentralmanager.mm +++ b/src/bluetooth/osx/osxbtcentralmanager.mm @@ -48,8 +48,6 @@ #include <algorithm> #include <limits> -Q_DECLARE_METATYPE(QLowEnergyCharacteristic) -Q_DECLARE_METATYPE(QLowEnergyDescriptor) Q_DECLARE_METATYPE(QLowEnergyHandle) QT_BEGIN_NAMESPACE diff --git a/src/bluetooth/qlowenergycharacteristic.h b/src/bluetooth/qlowenergycharacteristic.h index b991e9a2..154c9936 100644 --- a/src/bluetooth/qlowenergycharacteristic.h +++ b/src/bluetooth/qlowenergycharacteristic.h @@ -107,4 +107,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLowEnergyCharacteristic::PropertyTypes) QT_END_NAMESPACE +Q_DECLARE_METATYPE(QLowEnergyCharacteristic) + #endif // QLOWENERGYCHARACTERISTIC_H diff --git a/src/bluetooth/qlowenergycontroller_p.h b/src/bluetooth/qlowenergycontroller_p.h index 1c309c95..ad978ce1 100644 --- a/src/bluetooth/qlowenergycontroller_p.h +++ b/src/bluetooth/qlowenergycontroller_p.h @@ -490,11 +490,6 @@ Q_DECLARE_TYPEINFO(QLowEnergyControllerPrivate::Attribute, Q_MOVABLE_TYPE); QT_END_NAMESPACE -#ifdef QT_WINRT_BLUETOOTH -Q_DECLARE_METATYPE(QLowEnergyCharacteristic) -Q_DECLARE_METATYPE(QLowEnergyDescriptor) -#endif // QT_WINRT_BLUETOOTH - #endif // QT_OSX_BLUETOOTH || QT_IOS_BLUETOOTH #endif // QLOWENERGYCONTROLLERPRIVATE_P_H diff --git a/src/bluetooth/qlowenergydescriptor.h b/src/bluetooth/qlowenergydescriptor.h index 1dfe1c35..9e71fc56 100644 --- a/src/bluetooth/qlowenergydescriptor.h +++ b/src/bluetooth/qlowenergydescriptor.h @@ -89,4 +89,6 @@ protected: QT_END_NAMESPACE +Q_DECLARE_METATYPE(QLowEnergyDescriptor) + #endif // QLOWENERGYDESCRIPTOR_H diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index 6e33c565..9d3129fd 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -380,6 +380,8 @@ QLowEnergyService::QLowEnergyService(QSharedPointer<QLowEnergyServicePrivate> p, qRegisterMetaType<QLowEnergyService::ServiceError>(); qRegisterMetaType<QLowEnergyService::ServiceType>(); qRegisterMetaType<QLowEnergyService::WriteMode>(); + qRegisterMetaType<QLowEnergyCharacteristic>(); + qRegisterMetaType<QLowEnergyDescriptor>(); connect(p.data(), SIGNAL(error(QLowEnergyService::ServiceError)), this, SIGNAL(error(QLowEnergyService::ServiceError))); |