From ec716dc1fd2749a1c71274abbee751504d05083e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 26 May 2021 08:42:11 +0200 Subject: [PATCH] QNetworkInformation: Move android dependencies and perms to plugin It was a necessary workaround at the time, but this has since been fixed Task-number: QTBUG-90812 Change-Id: I8c0d5bf4c61d379736cd07a28c089c55d6befdee Reviewed-by: Assam Boudjelthia Reviewed-by: Edward Welbourne --- .../networkinformationbackends/android/CMakeLists.txt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/plugins/networkinformationbackends/android/CMakeLists.txt b/src/plugins/networkinformationbackends/android/CMakeLists.txt index 724dfd6788f..a53fa9a1ea5 100644 --- a/src/plugins/networkinformationbackends/android/CMakeLists.txt +++ b/src/plugins/networkinformationbackends/android/CMakeLists.txt @@ -28,21 +28,16 @@ qt_internal_add_plugin(QAndroidNetworkInformationBackend QT_USE_QSTRINGBUILDER ) -# @todo: androiddeployqt doesn't deploy JARs bundled with plugins, needs fix, temporarily bundle with Network -# QTBUG-90812 set_property( TARGET - # QAndroidNetworkInformationBackend - Network + QAndroidNetworkInformationBackend APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES jar/Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend.jar ) -# @todo: same as above, but for permissions set_property( TARGET - # QAndroidNetworkInformationBackend - Network + QAndroidNetworkInformationBackend APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.ACCESS_NETWORK_STATE )