diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-18 14:28:08 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-10-18 13:20:46 +0000 |
| commit | 373be4200b162ae9b2244d7019770911bc73317a (patch) | |
| tree | bdefc6a7e22402d7e08d3b3d2150870a129fc565 /src/android | |
| parent | 7e7f41e40c39361059ce4693c5e3a5e1ccd6f7e5 (diff) | |
Add conversion code for Java code
Add support to pro2cmake to convert java code for android.
Add support to override API_LEVEL for the Android sdk jar file. If the
sdk is not found, we'll default to the one located by QT_ANDROID_JAR.
Change-Id: If0b746dc7f9148ac43e6592a4a4dd23d46bbd4cd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/android')
| -rw-r--r-- | src/android/jar/.prev_CMakeLists.txt | 30 | ||||
| -rw-r--r-- | src/android/jar/CMakeLists.txt | 46 |
2 files changed, 52 insertions, 24 deletions
diff --git a/src/android/jar/.prev_CMakeLists.txt b/src/android/jar/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f4c807c33a --- /dev/null +++ b/src/android/jar/.prev_CMakeLists.txt @@ -0,0 +1,30 @@ +# Generated from jar.pro. + +set(java_sources + src/org/qtproject/qt5/android//accessibility/QtAccessibilityDelegate.java + src/org/qtproject/qt5/android//accessibility/QtNativeAccessibility.java + src/org/qtproject/qt5/android//CursorHandle.java + src/org/qtproject/qt5/android//EditContextView.java + src/org/qtproject/qt5/android//EditPopupMenu.java + src/org/qtproject/qt5/android//ExtractStyle.java + src/org/qtproject/qt5/android//QtActivityDelegate.java + src/org/qtproject/qt5/android//QtEditText.java + src/org/qtproject/qt5/android//QtInputConnection.java + src/org/qtproject/qt5/android//QtLayout.java + src/org/qtproject/qt5/android//QtMessageDialogHelper.java + src/org/qtproject/qt5/android//QtNative.java + src/org/qtproject/qt5/android//QtNativeLibrariesDir.java + src/org/qtproject/qt5/android//QtSurface.java + src/org/qtproject/qt5/android//QtThread.java +) + +add_jar(QtAndroid + INCLUDE_JARS ${QT_ANDROID_JAR} + SOURCES ${java_sources} +) + +install_jar(QtAndroid + DESTINATION jar + COMPONENT Devel +) + diff --git a/src/android/jar/CMakeLists.txt b/src/android/jar/CMakeLists.txt index edd8b54352..61af168a67 100644 --- a/src/android/jar/CMakeLists.txt +++ b/src/android/jar/CMakeLists.txt @@ -1,33 +1,31 @@ -# QtAndroid Jar - -# special case skip regeneration -# special case begin -set(path_prefix ${CMAKE_CURRENT_SOURCE_DIR}/src/org/qtproject/qt5/android/) +# Generated from jar.pro. set(java_sources - ${path_prefix}/accessibility/QtAccessibilityDelegate.java - ${path_prefix}/accessibility/QtNativeAccessibility.java - ${path_prefix}/CursorHandle.java - ${path_prefix}/EditContextView.java - ${path_prefix}/EditPopupMenu.java - ${path_prefix}/ExtractStyle.java - ${path_prefix}/QtActivityDelegate.java - ${path_prefix}/QtEditText.java - ${path_prefix}/QtInputConnection.java - ${path_prefix}/QtLayout.java - ${path_prefix}/QtMessageDialogHelper.java - ${path_prefix}/QtNative.java - ${path_prefix}/QtNativeLibrariesDir.java - ${path_prefix}/QtServiceDelegate.java - ${path_prefix}/QtSurface.java - ${path_prefix}/QtThread.java) + src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java + src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java + src/org/qtproject/qt5/android/CursorHandle.java + src/org/qtproject/qt5/android/EditContextView.java + src/org/qtproject/qt5/android/EditPopupMenu.java + src/org/qtproject/qt5/android/ExtractStyle.java + src/org/qtproject/qt5/android/QtActivityDelegate.java + src/org/qtproject/qt5/android/QtEditText.java + src/org/qtproject/qt5/android/QtInputConnection.java + src/org/qtproject/qt5/android/QtLayout.java + src/org/qtproject/qt5/android/QtMessageDialogHelper.java + src/org/qtproject/qt5/android/QtNative.java + src/org/qtproject/qt5/android/QtNativeLibrariesDir.java + src/org/qtproject/qt5/android/QtSurface.java + src/org/qtproject/qt5/android/QtThread.java + src/org/qtproject/qt5/android/QtServiceDelegate.java # special case +) add_jar(QtAndroid INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} - ) +) install_jar(QtAndroid DESTINATION jar - COMPONENT Devel) -# special case end + COMPONENT Devel +) + |