diff options
| author | Fab Stz <fabstz-it@yahoo.fr> | 2022-10-06 13:25:28 +0200 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2023-01-16 16:04:55 +0100 |
| commit | ef204f20c52ca2c8c8f61cecb6c435bf39592a89 (patch) | |
| tree | 9b2812b2c9a8ac0634649b57fe4dfddfa4b20d0a | |
| parent | a9d0f64b90741b3b14567544616db295c7e27673 (diff) | |
Adjust Android-related installation directories
Use the correct plugins directory when generating
dependenciencies. Install android jars to INSTALL_DATADIR.
Pick-to: 6.5
Task-number: QTBUG-106533
Change-Id: Ifc74a554236d798945dfb21ea65a775e9d752015
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | src/jar/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/webview/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/jar/CMakeLists.txt b/src/jar/CMakeLists.txt index 900dffe..ca0a9d9 100644 --- a/src/jar/CMakeLists.txt +++ b/src/jar/CMakeLists.txt @@ -8,8 +8,10 @@ qt_internal_add_jar(QtAndroidWebView OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) +qt_path_join(destination ${INSTALL_DATADIR} "jar") + install_jar(QtAndroidWebView - DESTINATION jar + DESTINATION ${destination} COMPONENT Devel ) diff --git a/src/webview/CMakeLists.txt b/src/webview/CMakeLists.txt index 8f9dc68..a58e084 100644 --- a/src/webview/CMakeLists.txt +++ b/src/webview/CMakeLists.txt @@ -35,7 +35,7 @@ if(ANDROID) jar/QtAndroidWebView.jar ) set_property(TARGET WebView APPEND PROPERTY QT_ANDROID_LIB_DEPENDENCIES - plugins/webview/libplugins_webview_qtwebview_android.so + ${INSTALL_PLUGINSDIR}/webview/libplugins_webview_qtwebview_android.so ) set_property(TARGET WebView APPEND PROPERTY QT_ANDROID_PERMISSIONS android.permission.ACCESS_FINE_LOCATION |