From 1de8cb8f913f7a6d4b802c04aff5a21852168ec0 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Tue, 12 Sep 2023 17:48:40 +0200
Subject: JNI: move JNI type macros into separate header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This removes the dependency from QJniObject to QtJniTypes, and allows us
to add more useful helpers to types declared through the macros, as we
can rely on QJniObject being fully declared.

Note: this is all undocumented API, so fine to change even though it
currently lives in a public header.

Change-Id: I07478ecb80ae166d619a09aed6820f680afed31b
Reviewed-by: Tinja Paavoseppä <tinja.paavoseppa@qt.io>
---
 src/corelib/kernel/qjniobject.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/corelib/kernel/qjniobject.h')

diff --git a/src/corelib/kernel/qjniobject.h b/src/corelib/kernel/qjniobject.h
index 75c896a728..de73676630 100644
--- a/src/corelib/kernel/qjniobject.h
+++ b/src/corelib/kernel/qjniobject.h
@@ -9,7 +9,6 @@
 #if defined(Q_QDOC) || defined(Q_OS_ANDROID)
 #include <jni.h>
 #include <QtCore/qjnienvironment.h>
-#include <QtCore/qjnitypes.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -42,7 +41,6 @@ public:
                      std::forward<Args>(args)...)
     {}
     QJniObject(jobject globalRef);
-    inline QJniObject(QtJniTypes::Object wrapper) noexcept : QJniObject(jobject(wrapper)) {}
     ~QJniObject();
 
     template<typename Class, typename ...Args>
-- 
cgit v1.2.3