summaryrefslogtreecommitdiffstats
path: root/src/sensors
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-09-04 22:33:40 -0700
committerJake Petroules <jake.petroules@qt.io>2017-09-06 18:22:42 +0000
commit4fbebd77c38c5e27404d2bcbcaa1a94ff540b4b7 (patch)
tree2709aff35c0d6de590971b604235109b0e983251 /src/sensors
parentccb803ae6072dee5b2312a9e6f578c6eff3aac42 (diff)
Android: remove support for local/debug deployment
This removes the pre-dexed JAR files activated by the absence of the bundled_jar_file CONFIG option, as versions of Android >= 5 no longer support this deployment mechanism. Now, the "bundled" JARs simply become normal JARs containing class files, and are neither activated by a bundled_jar_file CONFIG entry nor do they have a -bundled suffix in the file's base name. Task-number: QTBUG-62995 Change-Id: I23fe81254efee5517453f73b1938026257ddb7a6 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/sensors')
-rw-r--r--src/sensors/sensors.pro2
1 files changed, 0 insertions, 2 deletions
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