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/androidbroadcastreceiver.cpp | |
| parent | fc2a206322f6190226ebc1f04062f2c9170f0bac (diff) | |
| parent | b19148f9a0f820630bd83432d96117e9598c315d (diff) | |
Merge remote-tracking branch 'gerrit/dev' into btlebtle
Change-Id: Id7698ec157a4e06296bcc27d48aaa8325dd3c23a
Diffstat (limited to 'src/bluetooth/android/androidbroadcastreceiver.cpp')
| -rw-r--r-- | src/bluetooth/android/androidbroadcastreceiver.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bluetooth/android/androidbroadcastreceiver.cpp b/src/bluetooth/android/androidbroadcastreceiver.cpp index 50465017..c64e61ff 100644 --- a/src/bluetooth/android/androidbroadcastreceiver.cpp +++ b/src/bluetooth/android/androidbroadcastreceiver.cpp @@ -54,9 +54,7 @@ AndroidBroadcastReceiver::AndroidBroadcastReceiver(QObject* parent) : QObject(parent), valid(false) { // get Qt Context - // TODO: replace with QtAndroidPrivate::context() introduced by Qt 5.8 - contextObject = QAndroidJniObject(QtAndroidPrivate::activity() - ? QtAndroidPrivate::activity() : QtAndroidPrivate::service()); + contextObject = QAndroidJniObject(QtAndroidPrivate::context()); broadcastReceiverObject = QAndroidJniObject("org/qtproject/qt5/android/bluetooth/QtBluetoothBroadcastReceiver"); if (!broadcastReceiverObject.isValid()) |