diff options
| author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-02-18 10:44:14 +0200 |
|---|---|---|
| committer | Juha Vuolle <juha.vuolle@insta.fi> | 2022-02-23 08:06:08 +0200 |
| commit | 63d9642ea7a2d11b8e8e59faf4123a68b70c1618 (patch) | |
| tree | d402977735ae14b081e454e6d3c0ebe865832288 | |
| parent | 1834a38279d2d20c068ee4553d340157be3adef7 (diff) | |
| download | qtconnectivity-63d9642ea7a2d11b8e8e59faf4123a68b70c1618.tar.gz | |
Change qbluetoothlocaldevice error signal name usage to errorOccurred
The error was renamed to errorOccurred in Qt 6.
Change-Id: Ie4ca189fed3d985e80d3f3079569771a306af25a
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit e91c9ce06c92df424e2fd6d8acda1a4eda843923)
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_android.cpp | 6 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_bluez.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_winrt.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_android.cpp b/src/bluetooth/qbluetoothlocaldevice_android.cpp index b1571a42..c70c45d9 100644 --- a/src/bluetooth/qbluetoothlocaldevice_android.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_android.cpp @@ -307,7 +307,7 @@ QList<QBluetoothHostInfo> QBluetoothLocalDevice::allDevices() void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pairing pairing) { if (address.isNull()) { - QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, Q_ARG(QBluetoothLocalDevice::Error, QBluetoothLocalDevice::PairingError)); return; @@ -328,7 +328,7 @@ void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pai // BluetoothDevice::createBond() requires Android API 15 if (QNativeInterface::QAndroidApplication::sdkVersion() < 15 || !d_ptr->adapter()) { qCWarning(QT_BT_ANDROID) << "Unable to pair: requires Android API 15+"; - QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, Q_ARG(QBluetoothLocalDevice::Error, QBluetoothLocalDevice::PairingError)); return; @@ -343,7 +343,7 @@ void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pai newPairing == Paired ? JNI_TRUE : JNI_FALSE); if (!success) { - QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, Q_ARG(QBluetoothLocalDevice::Error, QBluetoothLocalDevice::PairingError)); } else { diff --git a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp index 282c3544..cf284220 100644 --- a/src/bluetooth/qbluetoothlocaldevice_bluez.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_bluez.cpp @@ -193,7 +193,7 @@ QList<QBluetoothHostInfo> QBluetoothLocalDevice::allDevices() void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pairing pairing) { if (!isValid() || address.isNull()) { - QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, Q_ARG(QBluetoothLocalDevice::Error, QBluetoothLocalDevice::PairingError)); return; diff --git a/src/bluetooth/qbluetoothlocaldevice_p.cpp b/src/bluetooth/qbluetoothlocaldevice_p.cpp index 50429f6f..b003626c 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_p.cpp @@ -103,7 +103,7 @@ void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pai { Q_UNUSED(address); Q_UNUSED(pairing); - QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, Q_ARG(QBluetoothLocalDevice::Error, QBluetoothLocalDevice::PairingError)); } diff --git a/src/bluetooth/qbluetoothlocaldevice_winrt.cpp b/src/bluetooth/qbluetoothlocaldevice_winrt.cpp index 9aae50c8..4e8b21a2 100644 --- a/src/bluetooth/qbluetoothlocaldevice_winrt.cpp +++ b/src/bluetooth/qbluetoothlocaldevice_winrt.cpp @@ -110,7 +110,7 @@ void QBluetoothLocalDevice::requestPairing(const QBluetoothAddress &address, Pai { Q_UNUSED(address); Q_UNUSED(pairing); - QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, + QMetaObject::invokeMethod(this, "errorOccurred", Qt::QueuedConnection, Q_ARG(QBluetoothLocalDevice::Error, QBluetoothLocalDevice::PairingError)); } |