From 59420d3a0b476834e875652c79bbc4ecf833df02 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 8 Jan 2025 12:47:11 +0100
Subject: [PATCH] JNI: avoid detach attempt when populating an uninitialized
 QString

QString::data on a non-const string will needlessly try to detach.
Avoid that by accessing the raw data pointer.

Addresses header review comment.

Change-Id: I89b4d3451cda517e5c5ca08173510b3529ce73aa
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit bf2491acc74528004af8d5f4caf50e88fcb86f89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/kernel/qjnitypes_impl.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qjnitypes_impl.h b/src/corelib/kernel/qjnitypes_impl.h
index 2af91a01a21..a5ce38d1a8c 100644
--- a/src/corelib/kernel/qjnitypes_impl.h
+++ b/src/corelib/kernel/qjnitypes_impl.h
@@ -27,7 +27,7 @@ static inline QString toQString(jstring string, JNIEnv *env)
     Q_ASSERT(string);
     const jsize length = env->GetStringLength(string);
     QString res(length, Qt::Uninitialized);
-    env->GetStringRegion(string, 0, length, reinterpret_cast<jchar *>(res.data()));
+    env->GetStringRegion(string, 0, length, reinterpret_cast<jchar *>(res.data_ptr().data()));
     return res;
 }
 } // namespace Detail