diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-20 03:01:37 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-20 03:01:37 +0200 |
| commit | f90878c456e10c4c3a091891bbe0dbc9e8fc48d7 (patch) | |
| tree | 33c06184cc8a6bac011ccd8a4cfd0abee0d86a12 /src/bluetooth/qbluetoothlocaldevice_p.h | |
| parent | 1a645c5a9b7d8b3f2f1448a95a3f37eb2f0c5a5d (diff) | |
| parent | 8110fdd4c6d80d05934768fa808a4cb187212fe0 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I9493330b991b387163f46b8359a611aa7ff7745e
Diffstat (limited to 'src/bluetooth/qbluetoothlocaldevice_p.h')
| -rw-r--r-- | src/bluetooth/qbluetoothlocaldevice_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/bluetooth/qbluetoothlocaldevice_p.h b/src/bluetooth/qbluetoothlocaldevice_p.h index 8f3e2b43..75e75aee 100644 --- a/src/bluetooth/qbluetoothlocaldevice_p.h +++ b/src/bluetooth/qbluetoothlocaldevice_p.h @@ -128,7 +128,6 @@ private slots: QBluetoothLocalDevice::Pairing pairing); void processConnectDeviceChanges(const QBluetoothAddress &address, bool isConnectEvent); void processDisplayConfirmation(const QBluetoothAddress &address, const QString &pin); - void processDisplayPinCode(const QBluetoothAddress &address, const QString &pin); private: QBluetoothLocalDevice *q_ptr; |