Make QJniObject and QJniEnvironment public API

As part of Qt 6 restructring for the extras modules, this change exposes
the Jni APIs which are very important for Android platform. This patch
adds the APIs QJniObject, QJniEnvironment, QJniExceptionCleaner based
from private QtCore and QtAndroidExtras.

The Jni interface is cross-platform which justifies the name, but
currently, this API is used mainly for Android, and the naming comes
generic without Android keyword to avoid any future limitation on
supporting other platforms.

[ChangeLog][QtCore] Add new QJniObject, QJniEnvironment and
QJniExceptionCleaner APIs.

Task-number: QTBUG-89482
Fixes: QTBUG-89633
Change-Id: I4382dd53a225375759b9d042f6035a4a9810572b
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>

1 files changed, 8 insertions, 7 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h
index a7f9aaa358..2d3cb49a96 100644
--- a/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h
+++ b/src/plugins/platforms/android/qandroidplatformfiledialoghelper.h
@@ -1,6 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2019 Klaralvdalens Datakonsult AB (KDAB)
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the plugins of the Qt Toolkit.
@@ -41,11 +42,11 @@
 #define QANDROIDPLATFORMFILEDIALOGHELPER_H
 
 #include <jni.h>
+
 #include <QEventLoop>
-#include <qpa/qplatformdialoghelper.h>
+#include <QtCore/QJniObject>
 #include <QtCore/private/qjnihelpers_p.h>
-#include <private/qjni_p.h>
-#include <QEventLoop>
+#include <qpa/qplatformdialoghelper.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -73,8 +74,8 @@ public:
     bool handleActivityResult(jint requestCode, jint resultCode, jobject data) override;
 
 private:
-    QJNIObjectPrivate getFileDialogIntent(const QString &intentType);
-    void takePersistableUriPermission(const QJNIObjectPrivate &uri);
+    QJniObject getFileDialogIntent(const QString &intentType);
+    void takePersistableUriPermission(const QJniObject &uri);
     void setIntentTitle(const QString &title);
     void setOpenableCategory();
     void setAllowMultipleSelections(bool allowMultiple);
@@ -82,8 +83,8 @@ private:
 
     QEventLoop m_eventLoop;
     QList<QUrl> m_selectedFile;
-    QJNIObjectPrivate m_intent;
-    const QJNIObjectPrivate m_activity;
+    QJniObject m_intent;
+    const QJniObject m_activity;
 };
 
 }