diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-03 08:08:56 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-03 08:09:06 +0100 |
| commit | b0a0b2572a5060c268f96a77716e7ea4e3065da4 (patch) | |
| tree | d1718acf15c19987984a787d0cd541825f32e26e /src/bluetooth/qlowenergycontroller.cpp | |
| parent | cd7165c29cab5543acd30c1a1f1279495700b2bb (diff) | |
| parent | 4cafd5cac8e920c6decbb974bf548e9c8f935d24 (diff) | |
Merge remote-tracking branch 'gerrit/dev' into neard
Change-Id: I1fc766d26aadb7cc01d33c4c8a2260411d7bb138
Diffstat (limited to 'src/bluetooth/qlowenergycontroller.cpp')
| -rw-r--r-- | src/bluetooth/qlowenergycontroller.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/bluetooth/qlowenergycontroller.cpp b/src/bluetooth/qlowenergycontroller.cpp index de713516..cf166281 100644 --- a/src/bluetooth/qlowenergycontroller.cpp +++ b/src/bluetooth/qlowenergycontroller.cpp @@ -238,18 +238,17 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT) \sa discoverServices(), error() */ -namespace { -class QLowEnergyControllerMetaTypes +void registerQLowEnergyControllerMetaType() { -public: - QLowEnergyControllerMetaTypes() - { + static bool initDone = false; + if (!initDone) { qRegisterMetaType<QLowEnergyController::ControllerState>(); qRegisterMetaType<QLowEnergyController::Error>(); + initDone = true; } -} qLowEnergyControllerMetaTypes; } + void QLowEnergyControllerPrivate::setError( QLowEnergyController::Error newError) { |