diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-07-25 14:42:06 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-07-25 14:42:18 +0200 |
| commit | 25638b02766ae3109bfc83b3249e6d0dc9e21bdb (patch) | |
| tree | 8ac8f0cd544dd39da674657940d6c509ea94721c /src/bluetooth/android/inputstreamthread.cpp | |
| parent | fc2a206322f6190226ebc1f04062f2c9170f0bac (diff) | |
| parent | b19148f9a0f820630bd83432d96117e9598c315d (diff) | |
Merge remote-tracking branch 'gerrit/dev' into btlebtle
Change-Id: Id7698ec157a4e06296bcc27d48aaa8325dd3c23a
Diffstat (limited to 'src/bluetooth/android/inputstreamthread.cpp')
| -rw-r--r-- | src/bluetooth/android/inputstreamthread.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bluetooth/android/inputstreamthread.cpp b/src/bluetooth/android/inputstreamthread.cpp index 982c477b..1cc353a3 100644 --- a/src/bluetooth/android/inputstreamthread.cpp +++ b/src/bluetooth/android/inputstreamthread.cpp @@ -42,13 +42,13 @@ #include <QtAndroidExtras/QAndroidJniEnvironment> #include "android/inputstreamthread_p.h" -#include "qbluetoothsocket_p.h" +#include "qbluetoothsocket_android_p.h" QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(QT_BT_ANDROID) -InputStreamThread::InputStreamThread(QBluetoothSocketPrivate *socket) +InputStreamThread::InputStreamThread(QBluetoothSocketPrivateAndroid *socket) : QObject(), m_socket_p(socket), expectClosure(false) { } |