diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-01-22 16:09:04 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-01-29 16:06:47 +0100 |
| commit | 101ab278913e3bacc7c0596ae0a5bf3c0fa2f922 (patch) | |
| tree | 66837c5ed25734465555ecb4b258a5baaa2e2d0b /src/plugins/platforms/android/qandroidplatformiconengine.cpp | |
| parent | 23fb1c50eecaed2f5a3ebfe95e72892c054e4414 (diff) | |
QJniArray: don't subclass QJniObject
QJniObject is not prepared for being subclassed (no virtual destructor),
and doing so is formally UB.
Instead of making QJniArray(Base) a QJniObject subclass, give it a
QJniObject member and make it convertible to/from QJniObject. Existing
code still works with this change, even though it removes all the
inherited QJniObject APIs for accessing fields and methods. However, as
the Java array classes have a very narrow and well-defined API anyway we
could, if needed, add those as C++ member functions instead of going
through calling-by-string.
Found during API review.
Pick-to: 6.7
Task-number: QTBUG-119952
Change-Id: Ic4437116eed5e15226449bdabe48ab657cb14dc3
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformiconengine.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformiconengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformiconengine.cpp b/src/plugins/platforms/android/qandroidplatformiconengine.cpp index 61dfa26cf0c..0adeb6e9e63 100644 --- a/src/plugins/platforms/android/qandroidplatformiconengine.cpp +++ b/src/plugins/platforms/android/qandroidplatformiconengine.cpp @@ -102,7 +102,7 @@ static QString fetchFont(const QString &query) HashSet innerSet; Q_ASSERT(outerList.isValid() && innerSet.isValid()); - for (QJniObject signature : signatures) { + for (const auto &signature : signatures) { const QJniArray<jbyte> byteArray = signature.callMethod<jbyte[]>("toByteArray"); // add takes an Object, not an Array |