summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
diff options
context:
space:
mode:
authorLeander Beernaert <leander.beernaert@qt.io>2019-10-18 14:28:08 +0200
committerLeander Beernaert <leander.beernaert@qt.io>2019-10-18 13:20:46 +0000
commit373be4200b162ae9b2244d7019770911bc73317a (patch)
treebdefc6a7e22402d7e08d3b3d2150870a129fc565 /src/plugins/bearer
parent7e7f41e40c39361059ce4693c5e3a5e1ccd6f7e5 (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/plugins/bearer')
-rw-r--r--src/plugins/bearer/android/jar/.prev_CMakeLists.txt24
-rw-r--r--src/plugins/bearer/android/jar/CMakeLists.txt15
2 files changed, 20 insertions, 19 deletions
diff --git a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
index d7f5c86488..f5f25c4f8b 100644
--- a/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
+++ b/src/plugins/bearer/android/jar/.prev_CMakeLists.txt
@@ -1,18 +1,16 @@
# Generated from jar.pro.
-#####################################################################
-## QtAndroidBearer Binary:
-#####################################################################
+set(java_sources
+ src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
+)
+
+add_jar(QtAndroidBearer
+ INCLUDE_JARS ${QT_ANDROID_JAR}
+ SOURCES ${java_sources}
+)
-add_qt_executable(QtAndroidBearer
- GUI
- INSTALL_DIRECTORY "${INSTALL_DIRECTORY}/jar"
- OUTPUT_DIRECTORY "$$MODULE_BASE_OUTDIR/jar"
- PUBLIC_LIBRARIES
- Qt::Gui
+install_jar(QtAndroidBearer
+ DESTINATION jar
+ COMPONENT Devel
)
-#### Keys ignored in scope 1:.:.:jar.pro:<TRUE>:
-# JAVACLASSPATH = "$$PWD/src"
-# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java"
-# _LOADED = "qt_build_paths"
diff --git a/src/plugins/bearer/android/jar/CMakeLists.txt b/src/plugins/bearer/android/jar/CMakeLists.txt
index 804e1d0cca..16641d42b7 100644
--- a/src/plugins/bearer/android/jar/CMakeLists.txt
+++ b/src/plugins/bearer/android/jar/CMakeLists.txt
@@ -1,10 +1,9 @@
-# special case begin
-# This is a manually edited file
-
-set(path_prefix ${CMAKE_CURRENT_SOURCE_DIR}/src/org/qtproject/qt5/android/bearer)
+#####################################################################
+## QtAndroidBearer Binary:
+#####################################################################
set(java_sources
- ${path_prefix}/QtNetworkReceiver.java
+ src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java
)
add_jar(QtAndroidBearer
@@ -16,4 +15,8 @@ install_jar(QtAndroidBearer
DESTINATION jar
COMPONENT Devel)
-# special case end
+#### Keys ignored in scope 1:.:.:jar.pro:<TRUE>:
+# JAVACLASSPATH = "$$PWD/src"
+# JAVASOURCES = "$$PWD/src/org/qtproject/qt5/android/bearer/QtNetworkReceiver.java"
+# _LOADED = "qt_build_paths"
+