diff options
author | Paul Olav Tvete <paul.tvete@digia.com> | 2013-03-04 14:09:10 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-05 16:34:19 +0100 |
commit | 96d4de7b36188cf8fe87b1d3f840bf9371744956 (patch) | |
tree | 9a6a9d71b90e6a56e89104510ecfa06107f68c08 /src/sensors | |
parent | 61ce0635fca7c7d38d64e7c59bc99d9512d2d879 (diff) |
Sensor implementation for Android
Based on the Necessitas project by Bogdan Vatra.
Contributors to the Qt5 project:
BogDan Vatra <bogdan@kde.org>
Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Paul Olav Tvete <paul.tvete@digia.com>
The full history of the Qt5 port can be found in refs/old-heads/android,
SHA-1 caa4103a80ef90db5eb9836f6b6028b7ce36c73a
Change-Id: I57e772ee5079c0ea74f685b65ae2864d73e7c750
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/sensors')
-rw-r--r-- | src/sensors/doc/src/compatmap.qdoc | 24 | ||||
-rw-r--r-- | src/sensors/sensors.pro | 5 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index abb71a15..8fe24adc 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -54,6 +54,7 @@ <tr> <td><b>Feature</b></td> <td><b>Blackberry</b></td> + <td><b>Android</b></td> <td><b>Linux</b></td> <td><b>Generic</b></td> </tr> @@ -61,6 +62,7 @@ <td nowrap="nowrap">Accelerometer</td> <td bgcolor="green"></td> <td bgcolor="green"></td> + <td bgcolor="green"></td> <td bgcolor="gray"></td> </tr> <tr> @@ -68,28 +70,33 @@ <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">Ambient Light Sensor</td> <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">Ambient Temperature Sensor</td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">Compass</td> <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">Gyroscope</td> <td bgcolor="green"></td> + <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> </tr> @@ -98,22 +105,26 @@ <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">IR Proximity Sensor</td> <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">Light Sensor</td> <td bgcolor="green"></td> + <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">Magnetometer</td> <td bgcolor="green"></td> + <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> </tr> @@ -121,6 +132,7 @@ <td nowrap="nowrap">Orientation Sensor</td> <td bgcolor="green"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> <td bgcolor="green"></td> </tr> <tr> @@ -128,16 +140,19 @@ <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">Proximity Sensor</td> <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> </tr> <tr> <td nowrap="nowrap">Rotation Sensor</td> <td bgcolor="green"></td> + <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="green"></td> </tr> @@ -146,11 +161,20 @@ <td bgcolor="gray"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + </tr> + <tr> + <td nowrap="nowrap">Tilt Sensor</td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="gray"></td> + <td bgcolor="green"></td> </tr> <tr> <td nowrap="nowrap">Sensor Gestures</td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> + <td bgcolor="gray"></td> <td bgcolor="green">1)</td> </tr> </table> diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro index b70c17c6..fe10a5e7 100644 --- a/src/sensors/sensors.pro +++ b/src/sensors/sensors.pro @@ -12,6 +12,11 @@ simulator { QMAKE_DOCS = $$PWD/doc/qtsensors.qdocconf +ANDROID_JAR_DEPENDENCIES = \ + jar/QtSensors.jar:org.qtproject.qt5.android.sensors.QtSensors +ANDROID_LIB_DEPENDENCIES = \ + plugins/sensors/libqtsensors_android.so + load(qt_module) PUBLIC_HEADERS += \ |