diff options
| -rw-r--r-- | src/plugins/sensors/android/jar/bundledjar.pro | 3 | ||||
| -rw-r--r-- | src/plugins/sensors/android/jar/distributedjar.pro | 2 | ||||
| -rw-r--r-- | src/plugins/sensors/android/jar/jar.pri | 13 | ||||
| -rw-r--r-- | src/plugins/sensors/android/jar/jar.pro | 15 | ||||
| -rw-r--r-- | src/sensors/sensors.pro | 5 |
5 files changed, 25 insertions, 13 deletions
diff --git a/src/plugins/sensors/android/jar/bundledjar.pro b/src/plugins/sensors/android/jar/bundledjar.pro new file mode 100644 index 00000000..2f6f195d --- /dev/null +++ b/src/plugins/sensors/android/jar/bundledjar.pro @@ -0,0 +1,3 @@ +TARGET = QtSensors-bundled +CONFIG += bundled_jar_file +include(jar.pri) diff --git a/src/plugins/sensors/android/jar/distributedjar.pro b/src/plugins/sensors/android/jar/distributedjar.pro new file mode 100644 index 00000000..2099826a --- /dev/null +++ b/src/plugins/sensors/android/jar/distributedjar.pro @@ -0,0 +1,2 @@ +TARGET = QtSensors +include(jar.pri) diff --git a/src/plugins/sensors/android/jar/jar.pri b/src/plugins/sensors/android/jar/jar.pri new file mode 100644 index 00000000..7e5916c8 --- /dev/null +++ b/src/plugins/sensors/android/jar/jar.pri @@ -0,0 +1,13 @@ +load(qt_build_paths) + +CONFIG += java +DESTDIR = $$MODULE_BASE_OUTDIR/jar + +JAVACLASSPATH += $$PWD/src + +JAVASOURCES += \ + $$PWD/src/org/qtproject/qt5/android/sensors/QtSensors.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target diff --git a/src/plugins/sensors/android/jar/jar.pro b/src/plugins/sensors/android/jar/jar.pro index 82f945b2..70373fe1 100644 --- a/src/plugins/sensors/android/jar/jar.pro +++ b/src/plugins/sensors/android/jar/jar.pro @@ -1,14 +1,3 @@ -load(qt_build_paths) +TEMPLATE = subdirs +SUBDIRS += bundledjar.pro distributedjar.pro -CONFIG += java -TARGET = QtSensors -DESTDIR = $$MODULE_BASE_OUTDIR/jar - -JAVACLASSPATH += $$PWD/src - -JAVASOURCES += \ - $$PWD/src/org/qtproject/qt5/android/sensors/QtSensors.java - -# install -target.path = $$[QT_INSTALL_PREFIX]/jar -INSTALLS += target diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index fe10a5e7..e7ad05f5 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -12,10 +12,15 @@ simulator { QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf +ANDROID_BUNDLED_JAR_DEPENDENCIES = \ + jar/QtSensors-bundled.jar:org.qtproject.qt5.android.sensors.QtSensors ANDROID_JAR_DEPENDENCIES = \ jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors ANDROID_LIB_DEPENDENCIES = \ plugins/sensors/libqtsensors_android.so +MODULE_PLUGIN_TYPES = \ + sensors \ + sensorgestures load(qt_module) |