From c28225e46984bfb97bbb69ed4a20b479de29ff1a Mon Sep 17 00:00:00 2001
From: Soheil Armin <soheil.armin@qt.io>
Date: Thu, 5 Sep 2024 00:12:46 +0300
Subject: [PATCH] Android: Add Void conversion support to QAndroidTypeConverter

Now the caller of toJavaObject() is be able to get
an object of Void type when the input parameter is QVariant<void*>.

Fixes: QTBUG-128586
Change-Id: I6eea670788461e4eb0d8f38a4a872c2c4759bdd8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
(cherry picked from commit e02813eeb5e3f3475541b50ba8d21a7bc724e698)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/platform/android/qandroidtypeconverter_p.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/corelib/platform/android/qandroidtypeconverter_p.h b/src/corelib/platform/android/qandroidtypeconverter_p.h
index ff294a1a46a..22ec20146b4 100644
--- a/src/corelib/platform/android/qandroidtypeconverter_p.h
+++ b/src/corelib/platform/android/qandroidtypeconverter_p.h
@@ -79,6 +79,8 @@ namespace QAndroidTypeConverter
             return env->NewLocalRef(QJniObject::construct<QtJniTypes::Boolean>(
                                             get<bool>(var))
                                             .object());
+        case QMetaType::Type::VoidStar:
+            return env->NewLocalRef(QJniObject::construct<QtJniTypes::Void>().object());
         case QMetaType::Type::QString:
             return env->NewLocalRef(
                     QJniObject::fromString(get<QString>(var)).object());