diff options
| author | Amir Masoud Abdol <amir.abdol@qt.io> | 2023-04-21 10:53:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-24 10:01:54 +0000 |
| commit | a16fb72a4d8a49483e4d6530e55e8144153695c5 (patch) | |
| tree | 1a239a8c0161b67320aa7954899a323baf76ff04 | |
| parent | 8f98833d9f015f4477d3b3ca557fff8f762e2c1d (diff) | |
| download | qtconnectivity-a16fb72a4d8a49483e4d6530e55e8144153695c5.tar.gz | |
Remove Unnecessary Q_DECLARE_METATYPE(QJniObject)
This doesn't seem to be necessary anymore. Maybe it was at some point,
Removing them, even without moving it to qtbase doesn't cause any
problems either.
Task-number: QTBUG-109394
Change-Id: Id9a62f23aba355e2e37f70a374aa20c48ce4ef83
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 2b022c35a465af1e3fd4cb1cbdb06eaef8cdaf56)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_android.cpp | 3 | ||||
| -rw-r--r-- | src/bluetooth/qlowenergycontroller_android.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/bluetooth/qbluetoothsocket_android.cpp b/src/bluetooth/qbluetoothsocket_android.cpp index 802ff6c8..b48dd51c 100644 --- a/src/bluetooth/qbluetoothsocket_android.cpp +++ b/src/bluetooth/qbluetoothsocket_android.cpp @@ -15,9 +15,6 @@ #include <QtCore/QTime> #include <QtCore/QJniEnvironment> -// ### Needs to be moved to qjniobject.h in qtbase -Q_DECLARE_METATYPE(QJniObject) - QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(QT_BT_ANDROID) diff --git a/src/bluetooth/qlowenergycontroller_android.cpp b/src/bluetooth/qlowenergycontroller_android.cpp index d01833e8..70eb47d9 100644 --- a/src/bluetooth/qlowenergycontroller_android.cpp +++ b/src/bluetooth/qlowenergycontroller_android.cpp @@ -15,9 +15,6 @@ #include <QtBluetooth/QLowEnergyAdvertisingParameters> #include <QtBluetooth/QLowEnergyConnectionParameters> -// ### Needs to be moved to qjniobject.h in qtbase -Q_DECLARE_METATYPE(QJniObject) - QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(QT_BT_ANDROID) |