diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-24 14:54:40 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-06-26 08:34:37 +0000 |
| commit | a9d2c5b6d7fa6b7365db8690f57aa78002c8bc4b (patch) | |
| tree | 5b63c1cae2efb87c1039fce1094c7fbb5319509e /src/network/.prev_CMakeLists.txt | |
| parent | ffec6c7180ce65f3aa20ca3f0016b23b702e73b2 (diff) | |
Android: Final changes for APK generation
Generate the ${MODULE}-android-dependencies.xml for the androiddeployqt
tool. This will ensure all the right plugins and dependencies are
packaged when generating the apk.
This change also changes the visibility for executable to default/public.
Not having this will cause the application to crash as we can't locate
main() in the executable (shared library).
Additionally pro2cmake conversion script has been updated to perform
the required conversions for the Android settings.
Finally, the 6 projects in QtBase that have Android dependencies have
been updated with the new script and the step that produces the xml
files in run at the end in QtPostProcess.cmake.
Change-Id: I9774ba1b123bc11cae972fa37054ef2c51988498
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/network/.prev_CMakeLists.txt')
| -rw-r--r-- | src/network/.prev_CMakeLists.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index b1ba59e7be..e5756e291d 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -76,10 +76,19 @@ extend_target(Network CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386" "/BASE:0x64000000" ) +if(ANDROID AND (QT_FEATURE_bearermanagement)) + set_property(TARGET Network APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES + jar/QtAndroidBearer.jar + ) + set_property(TARGET Network APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES + plugins/bearer/libqandroidbearer.so + ) + set_property(TARGET Network APPEND PROPERTY QT_ANDROID_PERMISSIONS + android.permission.ACCESS_NETWORK_STATE + ) +endif() + #### Keys ignored in scope 3:.:.:network.pro:QT_FEATURE_bearermanagement: -# ANDROID_BUNDLED_JAR_DEPENDENCIES = "jar/QtAndroidBearer.jar" -# ANDROID_LIB_DEPENDENCIES = "plugins/bearer/libqandroidbearer.so" -# ANDROID_PERMISSIONS = "android.permission.ACCESS_NETWORK_STATE" # MODULE_PLUGIN_TYPES = "bearer" extend_target(Network CONDITION QT_FEATURE_ftp |