From 5bf1bd00335d0c95c54de426a02da2a98257fedb Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 30 Sep 2016 18:33:12 -0700 Subject: Port qtsensors to the new configure framework Don't invoke pkg-config at build time, automatically check for sensorfw and compile the correct plugin if found. Change-Id: I30dcd41cdebd7cf082cec66f3122c24fbab5c893 Reviewed-by: Oswald Buddenhagen Reviewed-by: Robin Burchell --- src/sensors/configure.json | 32 ++++++++++++++++++++++++++++++++ src/sensors/doc/src/sensorfwbackend.qdoc | 4 ---- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 src/sensors/configure.json (limited to 'src/sensors') diff --git a/src/sensors/configure.json b/src/sensors/configure.json new file mode 100644 index 00000000..633de2a1 --- /dev/null +++ b/src/sensors/configure.json @@ -0,0 +1,32 @@ +{ + "module": "sensors", + + "libraries": { + "sensorfw": { + "label": "sensorfw", + "sources": [ + { "type": "pkgConfig", "args": "sensord-qt5" } + ] + } + }, + + "features": { + "sensorfw": { + "label": "sensorfw", + "condition": "libs.sensorfw", + "output": [ "privateFeature" ] + } + }, + + "report": [ + ], + + "summary": [ + { + "section": "Qt Sensors", + "entries": [ + "sensorfw" + ] + } + ] +} diff --git a/src/sensors/doc/src/sensorfwbackend.qdoc b/src/sensors/doc/src/sensorfwbackend.qdoc index 0ff31f80..c3189bbc 100644 --- a/src/sensors/doc/src/sensorfwbackend.qdoc +++ b/src/sensors/doc/src/sensorfwbackend.qdoc @@ -33,9 +33,5 @@ The Sensorfw sensor backend requires the Sensorfw and sensor daemon. Sensorfw was originally used in MeeGo, and is available on : https://github.com/mer-packages/sensorfw - - To compile the sensorfw backend, you need sensorfw installed and run qmake - with CONFIG+=sensorfw - */ -- cgit v1.2.3 From 12c11ffb6eb1f68c9c83a6eee3f9d4011746b122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Fri, 18 Nov 2016 16:44:36 +0100 Subject: Fix broken link in QMagnetometerReading The link, which describes how to calibrate the magnetometer sensor, is no longer available. As a replacement we now provide a generic approach for calibrating, and recommend that the user checks their device's documentation for more information. Change-Id: I04de5fba76b88fb7417d180ffe1f2c8c249610e5 Task-number: QTBUG-57184 Reviewed-by: Venugopal Shivashankar Reviewed-by: Lorn Potter --- src/sensors/qmagnetometer.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src/sensors') diff --git a/src/sensors/qmagnetometer.cpp b/src/sensors/qmagnetometer.cpp index a642bb9a..fc48783c 100644 --- a/src/sensors/qmagnetometer.cpp +++ b/src/sensors/qmagnetometer.cpp @@ -70,7 +70,13 @@ IMPLEMENT_READING(QMagnetometerReading) The accuracy of each reading is measured as a number from 0 to 1. A value of 1 is the highest level that the device can support and 0 is the worst. - \sa {http://wiki.forum.nokia.com/index.php/CS001671_-_Calibrating_the_magnetometer_sensor}{CS001671 - Calibrating the magnetometer sensor} + + \section2 Calibration + If the device is reporting low accuracy, then calibration might be needed before acceptable measurements + can be provided. + Basic calibration can usually be done by either rotating your device in a figure of eight, or by + rotating the device along each of its three axes. For more information, check your device's + documentation on how to calibrate the magnetic sensor. */ /*! @@ -144,7 +150,7 @@ void QMagnetometerReading::setZ(qreal z) Note that this only changes when measuring geomagnetic flux density. Raw magnetic flux readings will always have a value of 1. - \sa {QMagnetometerReading Units}, {http://wiki.forum.nokia.com/index.php/CS001671_-_Calibrating_the_magnetometer_sensor}{CS001671 - Calibrating the magnetometer sensor} + \sa {QMagnetometerReading Units}, {Calibration} */ qreal QMagnetometerReading::calibrationLevel() const -- cgit v1.2.3 From 2c595c382c50a5632b14eda00d85a9b7fcb09b5d Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 2 Dec 2016 02:09:24 +0300 Subject: Replace Q_DECL_OVERRIDE by override 'override' keyword can be used directly since Qt 5.7. Change-Id: Ibf0fc590f7e247a310a833a22ece700ec75199bb Reviewed-by: Lorn Potter --- src/sensors/make_sensor.pl | 10 +++++----- src/sensors/qaltimeter.h | 2 +- src/sensors/qambienttemperaturesensor.h | 2 +- src/sensors/qcompass.h | 2 +- src/sensors/qdistancesensor.h | 2 +- src/sensors/qgyroscope.h | 2 +- src/sensors/qholstersensor.h | 2 +- src/sensors/qirproximitysensor.h | 2 +- src/sensors/qlightsensor.h | 2 +- src/sensors/qmagnetometer.h | 2 +- src/sensors/qorientationsensor.h | 2 +- src/sensors/qpressuresensor.h | 2 +- src/sensors/qproximitysensor.h | 2 +- src/sensors/qrotationsensor.h | 2 +- src/sensors/qtapsensor.h | 2 +- src/sensors/qtiltsensor.h | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/sensors') diff --git a/src/sensors/make_sensor.pl b/src/sensors/make_sensor.pl index 6f36923a..bfa81472 100755 --- a/src/sensors/make_sensor.pl +++ b/src/sensors/make_sensor.pl @@ -107,8 +107,8 @@ public: ~'.$qmlsensor.'(); private: - QSensor *sensor() const Q_DECL_OVERRIDE; - QmlSensorReading *createReading() const Q_DECL_OVERRIDE; + QSensor *sensor() const override; + QmlSensorReading *createReading() const override; '.$sensor.' *m_sensor; }; @@ -127,8 +127,8 @@ Q_SIGNALS: void prop1Changed(); private: - QSensorReading *reading() const Q_DECL_OVERRIDE; - void readingUpdate() Q_DECL_OVERRIDE; + QSensorReading *reading() const override; + void readingUpdate() override; '.$sensor.' *m_sensor; qreal m_prop1; @@ -313,7 +313,7 @@ class Q_SENSORS_EXPORT '.$filter.' : public QSensorFilter public: virtual bool filter('.$reading.' *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT '.$sensor.' : public QSensor diff --git a/src/sensors/qaltimeter.h b/src/sensors/qaltimeter.h index 0d609b4d..50c9e83b 100644 --- a/src/sensors/qaltimeter.h +++ b/src/sensors/qaltimeter.h @@ -60,7 +60,7 @@ class Q_SENSORS_EXPORT QAltimeterFilter : public QSensorFilter public: virtual bool filter(QAltimeterReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QAltimeter : public QSensor diff --git a/src/sensors/qambienttemperaturesensor.h b/src/sensors/qambienttemperaturesensor.h index 181c6112..4198b15a 100644 --- a/src/sensors/qambienttemperaturesensor.h +++ b/src/sensors/qambienttemperaturesensor.h @@ -60,7 +60,7 @@ class Q_SENSORS_EXPORT QAmbientTemperatureFilter : public QSensorFilter public: virtual bool filter(QAmbientTemperatureReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QAmbientTemperatureSensor : public QSensor diff --git a/src/sensors/qcompass.h b/src/sensors/qcompass.h index 169f38c1..0d22c746 100644 --- a/src/sensors/qcompass.h +++ b/src/sensors/qcompass.h @@ -65,7 +65,7 @@ class Q_SENSORS_EXPORT QCompassFilter : public QSensorFilter public: virtual bool filter(QCompassReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QCompass : public QSensor diff --git a/src/sensors/qdistancesensor.h b/src/sensors/qdistancesensor.h index 499a695f..a6aef947 100644 --- a/src/sensors/qdistancesensor.h +++ b/src/sensors/qdistancesensor.h @@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QDistanceFilter : public QSensorFilter public: virtual bool filter(QDistanceReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QDistanceSensor : public QSensor diff --git a/src/sensors/qgyroscope.h b/src/sensors/qgyroscope.h index dc541793..7d7e287e 100644 --- a/src/sensors/qgyroscope.h +++ b/src/sensors/qgyroscope.h @@ -69,7 +69,7 @@ class Q_SENSORS_EXPORT QGyroscopeFilter : public QSensorFilter public: virtual bool filter(QGyroscopeReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QGyroscope : public QSensor diff --git a/src/sensors/qholstersensor.h b/src/sensors/qholstersensor.h index 253e05b4..43d02899 100644 --- a/src/sensors/qholstersensor.h +++ b/src/sensors/qholstersensor.h @@ -60,7 +60,7 @@ class Q_SENSORS_EXPORT QHolsterFilter : public QSensorFilter public: virtual bool filter(QHolsterReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QHolsterSensor : public QSensor diff --git a/src/sensors/qirproximitysensor.h b/src/sensors/qirproximitysensor.h index 153741c4..2941d6e0 100644 --- a/src/sensors/qirproximitysensor.h +++ b/src/sensors/qirproximitysensor.h @@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QIRProximityFilter : public QSensorFilter public: virtual bool filter(QIRProximityReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QIRProximitySensor : public QSensor diff --git a/src/sensors/qlightsensor.h b/src/sensors/qlightsensor.h index 0b16b46f..03f1871e 100644 --- a/src/sensors/qlightsensor.h +++ b/src/sensors/qlightsensor.h @@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QLightFilter : public QSensorFilter public: virtual bool filter(QLightReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class QLightSensorPrivate; diff --git a/src/sensors/qmagnetometer.h b/src/sensors/qmagnetometer.h index 25ad0405..f8b0fbfb 100644 --- a/src/sensors/qmagnetometer.h +++ b/src/sensors/qmagnetometer.h @@ -73,7 +73,7 @@ class Q_SENSORS_EXPORT QMagnetometerFilter : public QSensorFilter public: virtual bool filter(QMagnetometerReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class QMagnetometerPrivate; diff --git a/src/sensors/qorientationsensor.h b/src/sensors/qorientationsensor.h index 703abb3e..89823ca2 100644 --- a/src/sensors/qorientationsensor.h +++ b/src/sensors/qorientationsensor.h @@ -72,7 +72,7 @@ class Q_SENSORS_EXPORT QOrientationFilter : public QSensorFilter public: virtual bool filter(QOrientationReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QOrientationSensor : public QSensor diff --git a/src/sensors/qpressuresensor.h b/src/sensors/qpressuresensor.h index 5deb16bf..29ac235f 100644 --- a/src/sensors/qpressuresensor.h +++ b/src/sensors/qpressuresensor.h @@ -64,7 +64,7 @@ class Q_SENSORS_EXPORT QPressureFilter : public QSensorFilter public: virtual bool filter(QPressureReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QPressureSensor : public QSensor diff --git a/src/sensors/qproximitysensor.h b/src/sensors/qproximitysensor.h index 33cd4b2b..46a8b218 100644 --- a/src/sensors/qproximitysensor.h +++ b/src/sensors/qproximitysensor.h @@ -61,7 +61,7 @@ class Q_SENSORS_EXPORT QProximityFilter : public QSensorFilter public: virtual bool filter(QProximityReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QProximitySensor : public QSensor diff --git a/src/sensors/qrotationsensor.h b/src/sensors/qrotationsensor.h index de2053bb..d6c43acc 100644 --- a/src/sensors/qrotationsensor.h +++ b/src/sensors/qrotationsensor.h @@ -66,7 +66,7 @@ class Q_SENSORS_EXPORT QRotationFilter : public QSensorFilter public: virtual bool filter(QRotationReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class QRotationSensorPrivate; diff --git a/src/sensors/qtapsensor.h b/src/sensors/qtapsensor.h index d6207a17..31ba67f6 100644 --- a/src/sensors/qtapsensor.h +++ b/src/sensors/qtapsensor.h @@ -82,7 +82,7 @@ class Q_SENSORS_EXPORT QTapFilter : public QSensorFilter public: virtual bool filter(QTapReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class QTapSensorPrivate; diff --git a/src/sensors/qtiltsensor.h b/src/sensors/qtiltsensor.h index 6f83a347..2e0d0a78 100644 --- a/src/sensors/qtiltsensor.h +++ b/src/sensors/qtiltsensor.h @@ -67,7 +67,7 @@ class Q_SENSORS_EXPORT QTiltFilter : public QSensorFilter public: virtual bool filter(QTiltReading *reading) = 0; private: - bool filter(QSensorReading *reading) Q_DECL_OVERRIDE; + bool filter(QSensorReading *reading) override; }; class Q_SENSORS_EXPORT QTiltSensor : public QSensor -- cgit v1.2.3