summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/android/jar/jar.pro
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-05-23 13:18:07 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-05-23 13:18:07 +0200
commite8237a3d19e90c31af6d5a6c5e3a2f7815740226 (patch)
tree24696c0400318684bc00cf36d41a445051b67b96 /src/plugins/sensors/android/jar/jar.pro
parentf57241666fd4b7074cbe33567827293e2a0a9ad5 (diff)
parent3d75c54b8d0d055eff2a41cef7733b6204f8241c (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/plugins/sensors/android/jar/jar.pro')
-rw-r--r--src/plugins/sensors/android/jar/jar.pro15
1 files changed, 2 insertions, 13 deletions
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