diff --git a/src/corelib/kernel/qjnihelpers.cpp b/src/corelib/kernel/qjnihelpers.cpp index d477070c310..5d218b3811f 100644 --- a/src/corelib/kernel/qjnihelpers.cpp +++ b/src/corelib/kernel/qjnihelpers.cpp @@ -349,8 +349,10 @@ jint QtAndroidPrivate::initJNI(JavaVM *vm, JNIEnv *env) return JNI_ERR; } +#if QT_CONFIG(permissions) if (!registerPermissionNatives(qJniEnv)) return JNI_ERR; +#endif if (!registerNativeInterfaceNatives(qJniEnv)) return JNI_ERR; diff --git a/src/corelib/platform/android/qandroidextras.cpp b/src/corelib/platform/android/qandroidextras.cpp index 8cf2e463991..53920bd28d4 100644 --- a/src/corelib/platform/android/qandroidextras.cpp +++ b/src/corelib/platform/android/qandroidextras.cpp @@ -11,7 +11,7 @@ #include #include -#if QT_CONFIG(future) +#if QT_CONFIG(permissions) #include #endif @@ -1029,6 +1029,7 @@ void QAndroidActivityCallbackResultReceiver::registerCallback( callbackMap.insert(receiverRequestCode, callbackFunc); } +#if QT_CONFIG(permissions) // Permissions API QtAndroidPrivate::PermissionResult resultFromAndroid(jint value) @@ -1190,6 +1191,8 @@ bool QtAndroidPrivate::registerPermissionNatives(QJniEnvironment &env) }); } +#endif // QT_CONFIG(permissions) + QT_END_NAMESPACE #include "moc_qandroidextras_p.cpp" diff --git a/src/corelib/platform/android/qandroidextras_p.h b/src/corelib/platform/android/qandroidextras_p.h index 1ebd156cb38..dcc6169e516 100644 --- a/src/corelib/platform/android/qandroidextras_p.h +++ b/src/corelib/platform/android/qandroidextras_p.h @@ -226,7 +226,8 @@ namespace QtAndroidPrivate const QAndroidServiceConnection &serviceConnection, BindFlags flags = BindFlag::None); -#if QT_CONFIG(future) +#if QT_CONFIG(permissions) + QT_REQUIRE_CONFIG(future); enum PermissionResult { Undetermined, Authorized,