From 71b3901b45d44dde24684ed54d87b082c231409c Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 2 May 2013 14:00:38 +0200 Subject: Make it possible to bundle Android builds Add the bundled jar file and information about required plugins. Task-number: QTBUG-30751 Change-Id: I41918e8f04449439703ef1ae91c78636e9475f36 Reviewed-by: Paul Olav Tvete --- src/plugins/sensors/android/jar/bundledjar.pro | 3 +++ src/plugins/sensors/android/jar/distributedjar.pro | 2 ++ src/plugins/sensors/android/jar/jar.pri | 13 +++++++++++++ src/plugins/sensors/android/jar/jar.pro | 15 ++------------- 4 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 src/plugins/sensors/android/jar/bundledjar.pro create mode 100644 src/plugins/sensors/android/jar/distributedjar.pro create mode 100644 src/plugins/sensors/android/jar/jar.pri (limited to 'src/plugins/sensors') diff --git a/src/plugins/sensors/android/jar/bundledjar.pro b/src/plugins/sensors/android/jar/bundledjar.pro new file mode 100644 index 0000000..2f6f195 --- /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 0000000..2099826 --- /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 0000000..7e5916c --- /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 82f945b..70373fe 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 -- cgit v1.2.1 From a8bb2b1720372b79b1e7c03692252a3d6f0a7c0f Mon Sep 17 00:00:00 2001 From: Bernd Weimer Date: Fri, 3 May 2013 11:27:00 +0200 Subject: BlackBerry: Fix for GeoValues support Generic QSensor("QMagnetometer") crashed, because of a null pointer access. Fixed by disabling geo values support for generic magnetometer sensors. Change-Id: Ie3e654df10f325ff42cd3a08c3108e9b7a84604f Reviewed-by: Thomas McGuire --- src/plugins/sensors/blackberry/bbmagnetometer.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/plugins/sensors') diff --git a/src/plugins/sensors/blackberry/bbmagnetometer.cpp b/src/plugins/sensors/blackberry/bbmagnetometer.cpp index 45fd49b..a58dfe9 100644 --- a/src/plugins/sensors/blackberry/bbmagnetometer.cpp +++ b/src/plugins/sensors/blackberry/bbmagnetometer.cpp @@ -56,9 +56,7 @@ bool BbMagnetometer::updateReadingFromEvent(const sensor_event_t &event, QMagnet float x, y, z; QMagnetometer * const magnetometer = qobject_cast(sensor()); - Q_ASSERT(magnetometer); - const bool returnGeoValues = magnetometer->returnGeoValues(); - if (returnGeoValues) { + if (magnetometer && magnetometer->returnGeoValues()) { switch (event.accuracy) { case SENSOR_ACCURACY_UNRELIABLE: reading->setCalibrationLevel(0.0f); break; case SENSOR_ACCURACY_LOW: reading->setCalibrationLevel(0.1f); break; -- cgit v1.2.1 From 2066ecac699d541db444453e4d02e8295a5a5453 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 13 May 2013 11:55:24 +0200 Subject: Remove debug output. Task-number: QTBUG-31074 Change-Id: I7cb66ccbe74203e87e3bcc60400a8f7b2b2be0ed Reviewed-by: Thomas McGuire --- src/plugins/sensors/dummy/main.cpp | 1 - src/plugins/sensors/linux/main.cpp | 1 - 2 files changed, 2 deletions(-) (limited to 'src/plugins/sensors') diff --git a/src/plugins/sensors/dummy/main.cpp b/src/plugins/sensors/dummy/main.cpp index 89f07fc..062033d 100644 --- a/src/plugins/sensors/dummy/main.cpp +++ b/src/plugins/sensors/dummy/main.cpp @@ -55,7 +55,6 @@ class dummySensorPlugin : public QObject, public QSensorPluginInterface, public public: void registerSensors() { - qDebug() << "loaded the dummy plugin"; QSensorManager::registerBackend(QAccelerometer::type, dummyaccelerometer::id, this); QSensorManager::registerBackend(QAmbientLightSensor::type, dummylightsensor::id, this); } diff --git a/src/plugins/sensors/linux/main.cpp b/src/plugins/sensors/linux/main.cpp index 7e9ece5..0ce90f3 100644 --- a/src/plugins/sensors/linux/main.cpp +++ b/src/plugins/sensors/linux/main.cpp @@ -56,7 +56,6 @@ class LinuxSensorPlugin : public QObject, public QSensorPluginInterface, public public: void registerSensors() { - qDebug() << "loaded the Linux plugin"; QString path = QString::fromLatin1(qgetenv("QT_ACCEL_FILEPATH")); if (!path.isEmpty() && !QSensorManager::isBackendRegistered(QAccelerometer::type, LinuxSysAccelerometer::id)) QSensorManager::registerBackend(QAccelerometer::type, LinuxSysAccelerometer::id, this); -- cgit v1.2.1