diff options
| author | Mårten Nordheim <marten.nordheim@qt.io> | 2021-05-26 08:42:11 +0200 |
|---|---|---|
| committer | Mårten Nordheim <marten.nordheim@qt.io> | 2021-05-27 23:45:01 +0200 |
| commit | ec716dc1fd2749a1c71274abbee751504d05083e (patch) | |
| tree | 02acfd6694c38cb536457c6e7b5e6892b4c869ab /src/plugins/networkinformationbackends | |
| parent | a3f3af8a8fb8f8b09d1685df5ab836244f850a62 (diff) | |
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 <assam.boudjelthia@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/plugins/networkinformationbackends')
| -rw-r--r-- | src/plugins/networkinformationbackends/android/CMakeLists.txt | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/networkinformationbackends/android/CMakeLists.txt b/src/plugins/networkinformationbackends/android/CMakeLists.txt index 724dfd6788..a53fa9a1ea 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 ) |