qRegisterMetaType for QBluetoothServiceInfo

Android internals seem to require it. All other existing test related
registrations are removed as they are obsolete after this patch.

Change-Id: I49aa3b79bdc8ca5f463f4f7a88cbb612db39d15e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>

2 files changed, 1 insertions, 1 deletions

diff --git a/src/bluetooth/qbluetoothserviceinfo.cpp b/src/bluetooth/qbluetoothserviceinfo.cpp
index d98e616f..9da1cf78 100644
--- a/src/bluetooth/qbluetoothserviceinfo.cpp
+++ b/src/bluetooth/qbluetoothserviceinfo.cpp
@@ -346,6 +346,7 @@ bool QBluetoothServiceInfo::unregisterService()
 QBluetoothServiceInfo::QBluetoothServiceInfo()
     : d_ptr(QSharedPointer<QBluetoothServiceInfoPrivate>::create())
 {
+    qRegisterMetaType<QBluetoothServiceInfo>();
 }
 
 /*!
diff --git a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
index a0ff581c..25764703 100644
--- a/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
+++ b/tests/auto/qbluetoothservicediscoveryagent/tst_qbluetoothservicediscoveryagent.cpp
@@ -91,7 +91,6 @@ tst_QBluetoothServiceDiscoveryAgent::tst_QBluetoothServiceDiscoveryAgent()
 #endif
 
     qRegisterMetaType<QBluetoothDeviceInfo>();
-    qRegisterMetaType<QBluetoothServiceInfo>();
     qRegisterMetaType<QList<QBluetoothUuid> >();
     qRegisterMetaType<QBluetoothServiceDiscoveryAgent::Error>();
     qRegisterMetaType<QBluetoothDeviceDiscoveryAgent::Error>();