diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-03 15:05:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-09 11:56:31 +0200 |
| commit | b1f8ca8032bd0500f356c55c335937f7fb89d3f5 (patch) | |
| tree | c88267b551c0dc16a9f8699c20422fea784e2b5e /src/android/templates | |
| parent | d5e8a5d9cbcebec966833155728be3f2d293aafa (diff) | |
CMake: Fix various issues with the Android build
Certain resources and compiled jar files have to be copied into the
non-prefix build dir location. They were previously only installed,
which doesn't do anything in a non-prefix build.
Change pro2cmake to generate code that places the compiled java
jars into QT_BUILD_DIR, so that non-prefix builds work.
Place the module dependencies xml files into lib folder in non-prefix
builds.
Don't special case the output and install location of the Android QPA
plugin.
Task-number: QTBUG-85399
Change-Id: I4ac9d3929ea8ecc95ec99a77e621ad2121b68832
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/android/templates')
| -rw-r--r-- | src/android/templates/CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/android/templates/CMakeLists.txt b/src/android/templates/CMakeLists.txt index 8e007b7215..d0f1f4bf71 100644 --- a/src/android/templates/CMakeLists.txt +++ b/src/android/templates/CMakeLists.txt @@ -9,11 +9,10 @@ set(template_files set(template_directories res) -qt_install(FILES ${template_files} - DESTINATION src/android/templates - COMPONENT Devel) +qt_path_join(destination ${QT_INSTALL_DIR} "src/android/templates") +qt_copy_or_install(FILES ${template_files} + DESTINATION "${destination}") -qt_install(DIRECTORY ${template_directories} - DESTINATION src/android/templates - COMPONENT Devel) +qt_copy_or_install(DIRECTORY ${template_directories} + DESTINATION "${destination}") # special case end |