summaryrefslogtreecommitdiffstats
path: root/tests/auto/qbluetoothserviceinfo
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-01-16 16:07:18 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-01-28 07:48:13 +0000
commitfd88da6bf12c7c8edfd6c3d44cc641aed7477f0b (patch)
treeda59011c858baa683ba4594c6cab8807c5f219df /tests/auto/qbluetoothserviceinfo
parent769a597083a60dc530b9a28fe606dae6d1b02369 (diff)
Convert qRegisterMetaType<T>(const char*) to qRegisterMetaType<T>()
This is much safer and cleaner. [ChangeLog][QtBluetooth][Important Behavior Changes] Q_DECLARE_METATYPE added for QBluetoothServiceDiscoveryAgent::Error, QBluetoothSocket::SocketState, QBluetoothSocket::SocketError and QBluetoothDeviceInfo. This breaks source compatibility if application code has defined the above metatypes already. The applications Q_DECLARE_METATYPE must be removed to fix the compile error. Change-Id: I1c7cb1ee25832b7e5337c9aca6f36b21e8caf22e Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests/auto/qbluetoothserviceinfo')
-rw-r--r--tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp
index 61bad7c5..011b0e5f 100644
--- a/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp
+++ b/tests/auto/qbluetoothserviceinfo/tst_qbluetoothserviceinfo.cpp
@@ -78,9 +78,9 @@ tst_QBluetoothServiceInfo::~tst_QBluetoothServiceInfo()
void tst_QBluetoothServiceInfo::initTestCase()
{
- qRegisterMetaType<QBluetoothUuid::ProtocolUuid>("QBluetoothUuid::ProtocolUuid");
- qRegisterMetaType<QUuid>("QUuid");
- qRegisterMetaType<QBluetoothServiceInfo::Protocol>("QBluetoothServiceInfo::Protocol");
+ qRegisterMetaType<QBluetoothUuid::ProtocolUuid>();
+ qRegisterMetaType<QUuid>();
+ qRegisterMetaType<QBluetoothServiceInfo::Protocol>();
// start Bluetooth if not started
QBluetoothLocalDevice *device = new QBluetoothLocalDevice();
device->powerOn();