diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-16 16:07:18 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-28 07:48:13 +0000 |
| commit | fd88da6bf12c7c8edfd6c3d44cc641aed7477f0b (patch) | |
| tree | da59011c858baa683ba4594c6cab8807c5f219df /tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp | |
| parent | 769a597083a60dc530b9a28fe606dae6d1b02369 (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/qbluetoothsocket/tst_qbluetoothsocket.cpp')
| -rw-r--r-- | tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp index 6290f075..d7a35b1b 100644 --- a/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp +++ b/tests/auto/qbluetoothsocket/tst_qbluetoothsocket.cpp @@ -43,8 +43,6 @@ QT_USE_NAMESPACE -Q_DECLARE_METATYPE(QBluetoothSocket::SocketState) -Q_DECLARE_METATYPE(QBluetoothSocket::SocketError) Q_DECLARE_METATYPE(QBluetoothServiceInfo::Protocol) //same uuid as tests/bttestui @@ -100,8 +98,8 @@ Q_DECLARE_METATYPE(tst_QBluetoothSocket::ClientConnectionShutdown) tst_QBluetoothSocket::tst_QBluetoothSocket() { - qRegisterMetaType<QBluetoothSocket::SocketState>("QBluetoothSocket::SocketState"); - qRegisterMetaType<QBluetoothSocket::SocketError>("QBluetoothSocket::SocketError"); + qRegisterMetaType<QBluetoothSocket::SocketState>(); + qRegisterMetaType<QBluetoothSocket::SocketError>(); localDeviceFound = false; // true if we have a local adapter done_discovery = false; //true if we found remote device |