diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-10-27 12:25:14 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-11-03 13:09:03 +0000 |
| commit | 6772b20c3adb422a1e4557274300bed39e33018b (patch) | |
| tree | 210aab98a0e02bc9d7a3f4b874aac4008523e8e0 /src | |
| parent | 47c861fd35c284d4e857ece6633992777a45da74 (diff) | |
Unify meta type registration for QLEDescriptor and QLECharacteristic
The QLEControllerPrivate objects use the same function (apart from Apple
platforms) and unit tests do not have to register those types at all
anymore.
Change-Id: I06a4a035f5a8fba9a146a3c05d1157b47c22e056
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_osx.mm | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_winrt.cpp | 3 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergyservice.cpp | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index af6a557d..ddf3c9ec 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -286,6 +286,8 @@ void registerQLowEnergyControllerMetaType() qRegisterMetaType<QLowEnergyController::ControllerState>(); qRegisterMetaType<QLowEnergyController::Error>(); qRegisterMetaType<QLowEnergyConnectionParameters>(); + qRegisterMetaType<QLowEnergyCharacteristic>(); + qRegisterMetaType<QLowEnergyDescriptor>(); initDone = true; } } diff --git a/src/bluetooth/qlowenergycontroller_osx.mm b/src/bluetooth/qlowenergycontroller_osx.mm index 1206ef42..2958e6ed 100644 --- a/src/bluetooth/qlowenergycontroller_osx.mm +++ b/src/bluetooth/qlowenergycontroller_osx.mm @@ -72,6 +72,8 @@ static void registerQLowEnergyControllerMetaType() qRegisterMetaType<QLowEnergyController::Error>(); qRegisterMetaType<QLowEnergyHandle>("QLowEnergyHandle"); qRegisterMetaType<QSharedPointer<QLowEnergyServicePrivate> >(); + qRegisterMetaType<QLowEnergyCharacteristic>(); + qRegisterMetaType<QLowEnergyDescriptor>(); initDone = true; } } diff --git a/src/bluetooth/qlowenergycontroller_winrt.cpp b/src/bluetooth/qlowenergycontroller_winrt.cpp index d360f13f..741eebf6 100644 --- a/src/bluetooth/qlowenergycontroller_winrt.cpp +++ b/src/bluetooth/qlowenergycontroller_winrt.cpp @@ -282,8 +282,7 @@ QLowEnergyControllerPrivateWinRT::QLowEnergyControllerPrivateWinRT() { qCDebug(QT_BT_WINRT) << __FUNCTION__; - qRegisterMetaType<QLowEnergyCharacteristic>(); - qRegisterMetaType<QLowEnergyDescriptor>(); + registerQLowEnergyControllerMetaType(); } QLowEnergyControllerPrivateWinRT::~QLowEnergyControllerPrivateWinRT() diff --git a/src/bluetooth/qlowenergyservice.cpp b/src/bluetooth/qlowenergyservice.cpp index 35a3a7d0..1c27603a 100644 --- a/src/bluetooth/qlowenergyservice.cpp +++ b/src/bluetooth/qlowenergyservice.cpp @@ -380,8 +380,6 @@ 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))); |