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 /src/bluetooth/android | |
| 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 'src/bluetooth/android')
| -rw-r--r-- | src/bluetooth/android/serveracceptancethread.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/bluetooth/android/serveracceptancethread.cpp b/src/bluetooth/android/serveracceptancethread.cpp index cc639135..185cfa54 100644 --- a/src/bluetooth/android/serveracceptancethread.cpp +++ b/src/bluetooth/android/serveracceptancethread.cpp @@ -38,10 +38,12 @@ Q_DECLARE_LOGGING_CATEGORY(QT_BT_ANDROID) +Q_DECLARE_METATYPE(QBluetoothServer::Error) + ServerAcceptanceThread::ServerAcceptanceThread(QObject *parent) : QObject(parent), maxPendingConnections(1) { - qRegisterMetaType<QBluetoothServer::Error>("QBluetoothServer::Error"); + qRegisterMetaType<QBluetoothServer::Error>(); } ServerAcceptanceThread::~ServerAcceptanceThread() |