From 12d2ffd1fec476592f54f789eb72897b995174f2 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Thu, 27 Jun 2024 21:14:44 +0200 Subject: [PATCH 1/2] Fix warning with new android compiler --- androidnsd.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/androidnsd.cpp b/androidnsd.cpp index 69de66b..03bf8e9 100644 --- a/androidnsd.cpp +++ b/androidnsd.cpp @@ -60,7 +60,10 @@ QZeroConfPrivate::QZeroConfPrivate(QZeroConf *parent) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) nsdManager = QAndroidJniObject("qtzeroconf/QZeroConfNsdManager", "(JLandroid/content/Context;)V", reinterpret_cast(this), QtAndroid::androidActivity().object()); #else +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wnon-pod-varargs" nsdManager = QAndroidJniObject("qtzeroconf/QZeroConfNsdManager", "(JLandroid/content/Context;)V", reinterpret_cast(this), QNativeInterface::QAndroidApplication::context()); +#pragma GCC diagnostic pop #endif if (nsdManager.isValid()) { jclass objectClass = env->GetObjectClass(nsdManager.object()); From 2fbb52b70820a933ca954fdc3befaebc32072e3b Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Thu, 27 Jun 2024 22:10:05 +0200 Subject: [PATCH 2/2] Actually fix the issue and not only turn off warning --- androidnsd.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/androidnsd.cpp b/androidnsd.cpp index 03bf8e9..51fa28b 100644 --- a/androidnsd.cpp +++ b/androidnsd.cpp @@ -60,10 +60,11 @@ QZeroConfPrivate::QZeroConfPrivate(QZeroConf *parent) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) nsdManager = QAndroidJniObject("qtzeroconf/QZeroConfNsdManager", "(JLandroid/content/Context;)V", reinterpret_cast(this), QtAndroid::androidActivity().object()); #else -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wnon-pod-varargs" - nsdManager = QAndroidJniObject("qtzeroconf/QZeroConfNsdManager", "(JLandroid/content/Context;)V", reinterpret_cast(this), QNativeInterface::QAndroidApplication::context()); -#pragma GCC diagnostic pop + nsdManager = QAndroidJniObject("qtzeroconf/QZeroConfNsdManager", "(JLandroid/content/Context;)V", reinterpret_cast(this), QNativeInterface::QAndroidApplication::context() +#if (QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)) + .object() +#endif + ); #endif if (nsdManager.isValid()) { jclass objectClass = env->GetObjectClass(nsdManager.object());