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/plugins/platforms/android | |
| 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/plugins/platforms/android')
| -rw-r--r-- | src/plugins/platforms/android/CMakeLists.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/plugins/platforms/android/CMakeLists.txt b/src/plugins/platforms/android/CMakeLists.txt index 2203842fe8..d3363de4c7 100644 --- a/src/plugins/platforms/android/CMakeLists.txt +++ b/src/plugins/platforms/android/CMakeLists.txt @@ -53,14 +53,6 @@ qt_internal_add_plugin(QAndroidIntegrationPlugin Qt::GuiPrivate android jnigraphics -# special case begin - INSTALL_DIRECTORY - plugins/platforms - OUTPUT_DIRECTORY - plugins/platforms - ARCHIVE_INSTALL_DIRECTORY - plugins/platforms -# special case end ) #### Keys ignored in scope 1:.:.:android.pro:<TRUE>: |