1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNetworkInformation: Move android dependencies and perms to plugin

Browse Source 
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>
This commit is contained in:
Mårten Nordheim 2021-05-26 08:42:11 +02:00
parent a3f3af8a8f
commit ec716dc1fd
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/networkinformationbackends/android/CMakeLists.txt
View File

@ -28,21 +28,16 @@ qt_internal_add_plugin(QAndroidNetworkInformationBackend
QT_USE_QSTRINGBUILDER QT_USE_QSTRINGBUILDER
) )
# @todo: androiddeployqt doesn't deploy JARs bundled with plugins, needs fix, temporarily bundle with Network
# QTBUG-90812
set_property( set_property(
TARGET TARGET
# QAndroidNetworkInformationBackend QAndroidNetworkInformationBackend
Network
APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
jar/Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend.jar jar/Qt${QtBase_VERSION_MAJOR}AndroidNetworkInformationBackend.jar
) )
# @todo: same as above, but for permissions
set_property( set_property(
TARGET TARGET
# QAndroidNetworkInformationBackend QAndroidNetworkInformationBackend
Network
APPEND PROPERTY QT_ANDROID_PERMISSIONS APPEND PROPERTY QT_ANDROID_PERMISSIONS
android.permission.ACCESS_NETWORK_STATE android.permission.ACCESS_NETWORK_STATE
) )