diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-07 13:46:00 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-06-07 13:46:00 +0200 |
| commit | d487c74a7f6a18a106314d3dc58013c6cfc2e1ca (patch) | |
| tree | a061010dd8503d6263b72513a454aa5d2356ac5f /src/sensors | |
| parent | 102bdf35b13f1b60df26052341ebc5a2833518c7 (diff) | |
| parent | 5ae30e1ae8de41478476567148846a80cd508e7b (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
sync.profile
Change-Id: I0eaa022110b99fc5bc7cdf6304b5cda3ad3e8f8c
Diffstat (limited to 'src/sensors')
| -rw-r--r-- | src/sensors/doc/src/qtsensors.qdoc | 2 | ||||
| -rw-r--r-- | src/sensors/doc/src/sensor-examples.qdoc | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/sensors/doc/src/qtsensors.qdoc b/src/sensors/doc/src/qtsensors.qdoc index 9213371d..1b818c8b 100644 --- a/src/sensors/doc/src/qtsensors.qdoc +++ b/src/sensors/doc/src/qtsensors.qdoc @@ -29,7 +29,6 @@ \page qtsensors-index.html \title Qt Sensors \brief The Qt Sensors API provides access to sensors via QML and C++ interfaces. - \ingroup technology-apis The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. The Qt Sensors API also provides motion gesture recognition API for devices. @@ -117,4 +116,3 @@ \li Information about the Sensorfw sensor backend. \endtable */ - diff --git a/src/sensors/doc/src/sensor-examples.qdoc b/src/sensors/doc/src/sensor-examples.qdoc index d934c8a0..1dd58529 100644 --- a/src/sensors/doc/src/sensor-examples.qdoc +++ b/src/sensors/doc/src/sensor-examples.qdoc @@ -33,8 +33,4 @@ These are the Qt Sensors examples. - \generatelist related */ - - - |