diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-03-27 10:30:09 +0100 |
| commit | 7bfd9ae91ff801ae6b36d3fe7563bcb2781c5e01 (patch) | |
| tree | 6bf7b4e8caa9bbb9287088368db1d7a98097ba5a /src/bluetooth | |
| parent | 6f442044a17ae8c2acb201ba8c9eb1a8cb452899 (diff) | |
| parent | d21da7829811d129b96ca0eb2a56cb6bdae4f1a7 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.qmake.conf
Change-Id: Id7c4409314c2ad5daf5bc9860befe096a2384849
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_bluezdbus.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_android_p.h | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/bluetooth/qbluetoothsocket_bluezdbus.cpp b/src/bluetooth/qbluetoothsocket_bluezdbus.cpp index c98d0c26..d3fc13e4 100644 --- a/src/bluetooth/qbluetoothsocket_bluezdbus.cpp +++ b/src/bluetooth/qbluetoothsocket_bluezdbus.cpp @@ -538,6 +538,8 @@ void QBluetoothSocketPrivateBluezDBus::remoteConnected(const QDBusUnixFileDescri q, &QBluetoothSocket::readyRead); connect(localSocket, &QLocalSocket::stateChanged, this, &QBluetoothSocketPrivateBluezDBus::socketStateChanged); + connect(localSocket, &QLocalSocket::bytesWritten, + q, &QBluetoothSocket::bytesWritten); socket = descriptor; q->setSocketState(QBluetoothSocket::ConnectedState); diff --git a/src/bluetooth/qlowenergycontroller_android_p.h b/src/bluetooth/qlowenergycontroller_android_p.h index 3f97e363..f05c63ca 100644 --- a/src/bluetooth/qlowenergycontroller_android_p.h +++ b/src/bluetooth/qlowenergycontroller_android_p.h @@ -60,15 +60,8 @@ #include "qlowenergycontroller.h" #include "qlowenergycontrollerbase_p.h" -#if QT_CONFIG(bluez) && !defined(QT_BLUEZ_NO_BTLE) -#include <QtBluetooth/QBluetoothSocket> -#elif defined(QT_ANDROID_BLUETOOTH) #include <QtAndroidExtras/QAndroidJniObject> #include "android/lowenergynotificationhub_p.h" -#elif defined(QT_WINRT_BLUETOOTH) -#include <wrl.h> -#include <windows.devices.bluetooth.h> -#endif #include <functional> @@ -77,16 +70,7 @@ QT_BEGIN_NAMESPACE class QLowEnergyServiceData; class QTimer; -#if QT_CONFIG(bluez) && !defined(QT_BLUEZ_NO_BTLE) -class HciManager; -class LeCmacCalculator; -class QSocketNotifier; -class RemoteDeviceManager; -#elif defined(QT_ANDROID_BLUETOOTH) class LowEnergyNotificationHub; -#elif defined(QT_WINRT_BLUETOOTH) -class QWinRTLowEnergyServiceHandler; -#endif extern void registerQLowEnergyControllerMetaType(); |