diff --git a/src/bluetooth/android/androidbroadcastreceiver.cpp b/src/bluetooth/android/androidbroadcastreceiver.cpp index da551be2..e6962da7 100644 --- a/src/bluetooth/android/androidbroadcastreceiver.cpp +++ b/src/bluetooth/android/androidbroadcastreceiver.cpp @@ -23,7 +23,7 @@ AndroidBroadcastReceiver::AndroidBroadcastReceiver(QObject* parent) broadcastReceiverObject = QJniObject::construct(); if (!broadcastReceiverObject.isValid()) return; - broadcastReceiverObject.setField("qtObject", reinterpret_cast(this)); + broadcastReceiverObject.setField("qtObject", reinterpret_cast(this)); intentFilterObject = QJniObject::construct(); if (!intentFilterObject.isValid()) diff --git a/src/bluetooth/android/inputstreamthread.cpp b/src/bluetooth/android/inputstreamthread.cpp index 14fab8b9..c322a16c 100644 --- a/src/bluetooth/android/inputstreamthread.cpp +++ b/src/bluetooth/android/inputstreamthread.cpp @@ -28,7 +28,7 @@ bool InputStreamThread::run() javaInputStreamThread.callMethod("setInputStream", m_socket_p->inputStream.object()); - javaInputStreamThread.setField("qtObject", reinterpret_cast(this)); + javaInputStreamThread.setField("qtObject", reinterpret_cast(this)); javaInputStreamThread.setField("logEnabled", QT_BT_ANDROID().isDebugEnabled()); javaInputStreamThread.callMethod("start"); diff --git a/src/bluetooth/android/lowenergynotificationhub.cpp b/src/bluetooth/android/lowenergynotificationhub.cpp index cf79059e..ea01dd62 100644 --- a/src/bluetooth/android/lowenergynotificationhub.cpp +++ b/src/bluetooth/android/lowenergynotificationhub.cpp @@ -51,7 +51,7 @@ LowEnergyNotificationHub::LowEnergyNotificationHub(const QBluetoothAddress &remo hubMap()->insert(javaToCtoken, this); lock.unlock(); - jBluetoothLe.setField("qtObject", javaToCtoken); + jBluetoothLe.setField("qtObject", jlong(javaToCtoken)); } LowEnergyNotificationHub::~LowEnergyNotificationHub() diff --git a/src/bluetooth/android/serveracceptancethread.cpp b/src/bluetooth/android/serveracceptancethread.cpp index 55f0f4db..a23f5b7e 100644 --- a/src/bluetooth/android/serveracceptancethread.cpp +++ b/src/bluetooth/android/serveracceptancethread.cpp @@ -80,7 +80,7 @@ void ServerAcceptanceThread::run() if (!javaThread.isValid()) return; - javaThread.setField("qtObject", reinterpret_cast(this)); + javaThread.setField("qtObject", reinterpret_cast(this)); javaThread.setField("logEnabled", QT_BT_ANDROID().isDebugEnabled()); QString tempUuid = m_uuid.toString(QUuid::WithoutBraces); diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp index ed745856..e5498267 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp @@ -46,7 +46,7 @@ QBluetoothDeviceDiscoveryAgentPrivate::~QBluetoothDeviceDiscoveryAgentPrivate() stop(); if (leScanner.isValid()) - leScanner.setField("qtObject", reinterpret_cast(nullptr)); + leScanner.setField("qtObject", reinterpret_cast(nullptr)); if (receiver) { receiver->unregisterReceiver(); @@ -439,7 +439,7 @@ void QBluetoothDeviceDiscoveryAgentPrivate::startLowEnergyScan() return; } - leScanner.setField("qtObject", reinterpret_cast(receiver)); + leScanner.setField("qtObject", reinterpret_cast(receiver)); } jboolean result = leScanner.callMethod("scanForLeDevice", true);