diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-12-15 13:06:52 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-12-15 17:52:26 +0100 |
| commit | f2b49789b2f9f9145d318a00868d2f054052aee4 (patch) | |
| tree | ebc16f1075b9e9448d622705f5040aa0030ce484 /src/corelib/kernel/qjniobject.cpp | |
| parent | 8892819d0c89d0434c94f0c0951458719cba5c2e (diff) | |
QJniObject: fix binary compatibility breakage
Amends 601dbd64993fcbbb2ce6aaa95ef153ffd4f852b9, which changed the
signature of the private callVoidMethodV function. However, that
function got called in a public template member function, so callsites
depended on the private function to be present. By changing the function
signature, we broke binary compatibility.
Bring the original function back and implement the variadic overload
through it.
Fixes: QTBUG-109428
Pick-to: 6.4 6.5
Change-Id: Ie2297e120fbeb146089c0fbe8f91f8b8d3c79713
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/corelib/kernel/qjniobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qjniobject.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/kernel/qjniobject.cpp b/src/corelib/kernel/qjniobject.cpp index 62a5993559b..df4335092e4 100644 --- a/src/corelib/kernel/qjniobject.cpp +++ b/src/corelib/kernel/qjniobject.cpp @@ -393,10 +393,15 @@ void QJniObject::callVoidMethodV(JNIEnv *env, jmethodID id, ...) const { va_list args; va_start(args, id); - env->CallVoidMethodV(d->m_jobject, id, args); + callVoidMethodV(env, id, args); va_end(args); } +void QJniObject::callVoidMethodV(JNIEnv *env, jmethodID id, va_list args) const +{ + env->CallVoidMethodV(d->m_jobject, id, args); +} + jmethodID QJniObject::getCachedMethodID(JNIEnv *env, jclass clazz, const QByteArray &className, |