diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/android/jar/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/android/CMakeLists.txt b/src/android/CMakeLists.txt index 7b0b0cd930..a61ff1c4b0 100644 --- a/src/android/CMakeLists.txt +++ b/src/android/CMakeLists.txt @@ -1,12 +1,13 @@ # Generated from android.pro. # special case begin -# Only build jars during android build? +# Only build jars during Android build and install the templates for the +# androiddeployqt tool. +# android if (ANDROID) add_subdirectory(jar) + add_subdirectory(java) + add_subdirectory(templates) endif() # special case end -# Templates need to be installed during host build -add_subdirectory(java) -add_subdirectory(templates) diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt index 31afb3fdf4..066a67591f 100644 --- a/src/android/jar/CMakeLists.txt +++ b/src/android/jar/CMakeLists.txt @@ -22,7 +22,7 @@ set(java_sources ${path_prefix}/QtThread.java) add_jar(QtAndroid - INCLUDE_JARS ${android_jar} + INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} ) |