summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/sensors/android/jar/bundledjar.pro3
-rw-r--r--src/plugins/sensors/android/jar/distributedjar.pro2
-rw-r--r--src/plugins/sensors/android/jar/jar.pri13
-rw-r--r--src/plugins/sensors/android/jar/jar.pro16
-rw-r--r--src/sensors/sensors.pro2
5 files changed, 14 insertions, 22 deletions
diff --git a/src/plugins/sensors/android/jar/bundledjar.pro b/src/plugins/sensors/android/jar/bundledjar.pro
deleted file mode 100644
index 2f6f195d..00000000
--- a/src/plugins/sensors/android/jar/bundledjar.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 2099826a..00000000
--- a/src/plugins/sensors/android/jar/distributedjar.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-TARGET = QtSensors
-include(jar.pri)
diff --git a/src/plugins/sensors/android/jar/jar.pri b/src/plugins/sensors/android/jar/jar.pri
deleted file mode 100644
index 7e5916c8..00000000
--- a/src/plugins/sensors/android/jar/jar.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-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 70373fe1..1d5d4ae4 100644
--- a/src/plugins/sensors/android/jar/jar.pro
+++ b/src/plugins/sensors/android/jar/jar.pro
@@ -1,3 +1,15 @@
-TEMPLATE = subdirs
-SUBDIRS += bundledjar.pro distributedjar.pro
+TARGET = QtSensors
+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/sensors/sensors.pro b/src/sensors/sensors.pro
index e66d427f..eaaa73fd 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -13,8 +13,6 @@ qtHaveModule(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