From fd88da6bf12c7c8edfd6c3d44cc641aed7477f0b Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@theqtcompany.com>
Date: Fri, 16 Jan 2015 16:07:18 +0100
Subject: 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>
---
 tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp')

diff --git a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
index 01a79a03..fca02b28 100644
--- a/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
+++ b/tests/auto/qbluetoothserver/tst_qbluetoothserver.cpp
@@ -118,8 +118,8 @@ void tst_QBluetoothServer::setHostMode(const QBluetoothAddress &localAdapter,
 
 void tst_QBluetoothServer::initTestCase()
 {
-    qRegisterMetaType<QBluetooth::SecurityFlags>("QBluetooth::SecurityFlags");
-    qRegisterMetaType<QBluetoothServer::Error>("QBluetoothServer::Error");
+    qRegisterMetaType<QBluetooth::SecurityFlags>();
+    qRegisterMetaType<QBluetoothServer::Error>();
 
     QBluetoothLocalDevice device;
     if (!device.isValid())
-- 
cgit v1.2.3