diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-01 08:34:25 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-12-01 08:34:25 +0100 |
| commit | ecf8e597a21013936ea4fe195113141bca848f9a (patch) | |
| tree | 3250cea2c4d8e8dc3bf7f55cef4b124942663d2d /src/bluetooth/qbluetoothlocaldevice.cpp | |
| parent | 56a7c671c48d42ebbedd1c5a83d3ee3301015a18 (diff) | |
| parent | 741f5e26cd618aeff349dd612516148b50c85dde (diff) | |
Merge remote-tracking branch 'gerrit/5.5' into 5.6
Change-Id: I4404df69bfdac335e9c1eb63e4ada3ba89b48b6c
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice.cpp b/src/bluetooth/qbluetoothlocaldevice.cpp index 99264962..eb270f8d 100644 --- a/src/bluetooth/qbluetoothlocaldevice.cpp +++ b/src/bluetooth/qbluetoothlocaldevice.cpp @@ -97,20 +97,17 @@ QT_BEGIN_NAMESPACE */ -namespace { -class LocalDeviceRegisterMetaTypes +void registerQBluetoothLocalDeviceMetaType() { -public: - LocalDeviceRegisterMetaTypes() - { + static bool initDone = false; + if (!initDone) { qRegisterMetaType<QBluetoothLocalDevice::HostMode>(); qRegisterMetaType<QBluetoothLocalDevice::Pairing>(); qRegisterMetaType<QBluetoothLocalDevice::Error>(); + initDone = true; } -} _registerLocalDeviceMetaTypes; } - #ifndef QT_OSX_BLUETOOTH /*! |