jbagg/QtZeroConf
1
0
Fork 1
mirror of https://github.com/jbagg/QtZeroConf.git synced 2025-06-25 01:11:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

AndroidNDS - fix Android building with Qt6.7

Browse Source 
QNativeInterface does not provide source compatibility.  context() return
type changed.

https://bugreports.qt.io/browse/QTBUG-123900

Solution contributed by https://github.com/0xFEEDC0DE64 in
https://github.com/jbagg/QtZeroConf/pull/68
This commit is contained in:
Jonathan Bagg
2024-06-28 10:45:52 -04:00
parent 475aedb0bd
commit b13132feea
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
androidnsd.cpp
View File

@ -59,8 +59,11 @@ QZeroConfPrivate::QZeroConfPrivate(QZeroConf *parent)
// Note: needs to be quint64 as uintptr_t might be 32 or 64 bit depending on the system, while Java expects a jlong which is always 64 bit.
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
nsdManager = QAndroidJniObject("qtzeroconf/QZeroConfNsdManager", "(JLandroid/content/Context;)V", reinterpret_cast<quint64>(this), QtAndroid::androidActivity().object());
#else
#elif (QT_VERSION < QT_VERSION_CHECK(6, 7, 0))
nsdManager = QAndroidJniObject("qtzeroconf/QZeroConfNsdManager", "(JLandroid/content/Context;)V", reinterpret_cast<quint64>(this), QNativeInterface::QAndroidApplication::context());
#else
// QNativeInterface does not provide source compatibility. https://bugreports.qt.io/browse/QTBUG-123900 https://forum.qt.io/topic/157493/binary-and-source-compatibility-breakage-in-6-7
nsdManager = QAndroidJniObject("qtzeroconf/QZeroConfNsdManager", "(JLandroid/content/Context;)V", reinterpret_cast<quint64>(this), QNativeInterface::QAndroidApplication::context().object<jobject>());
#endif
if (nsdManager.isValid()) {
jclass objectClass = env->GetObjectClass(nsdManager.object<jobject>());