diff options
7 files changed, 6 insertions, 14 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))); diff --git a/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp b/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp index 3df27d92..e01457eb 100644 --- a/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp +++ b/tests/auto/qlowenergycontroller-gattserver/test/tst_qlowenergycontroller-gattserver.cpp @@ -243,10 +243,6 @@ void TestQLowEnergyControllerGattServer::advertisedData() QVERIFY(m_serverInfo.serviceUuids().contains(QBluetoothUuid(quint16(0x2000)))); } -// TODO: Why on earth is this not in the library??? -Q_DECLARE_METATYPE(QLowEnergyCharacteristic) -Q_DECLARE_METATYPE(QLowEnergyDescriptor) - void TestQLowEnergyControllerGattServer::serverCommunication() { qRegisterMetaType<QLowEnergyCharacteristic>(); diff --git a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp index 6475b8c4..f5e1ec4b 100644 --- a/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp +++ b/tests/auto/qlowenergycontroller/tst_qlowenergycontroller.cpp @@ -91,9 +91,6 @@ private: QList<QBluetoothUuid> foundServices; }; -Q_DECLARE_METATYPE(QLowEnergyCharacteristic) -Q_DECLARE_METATYPE(QLowEnergyDescriptor) - tst_QLowEnergyController::tst_QLowEnergyController() { qRegisterMetaType<QLowEnergyCharacteristic>(); |