diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:19:38 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:19:38 +0200 |
commit | 623a50a536ab0586faa8ae6f9ea2700069ceda00 (patch) | |
tree | 58772be9a081e72ea00814c16270acf85e7339bd /src/sensors | |
parent | b11d8d673ba36ab22c0d7a40ea53d57f284cca13 (diff) | |
parent | 47198045f8df3135498f061ae3da5a852a0a150c (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I4cfd0e2a2f108f5ecf79c56418c02928b041856e
Diffstat (limited to 'src/sensors')
-rw-r--r-- | src/sensors/doc/src/compatmap.qdoc | 4 | ||||
-rw-r--r-- | src/sensors/qsensor.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sensors/doc/src/compatmap.qdoc b/src/sensors/doc/src/compatmap.qdoc index 7fbe3bb5..5e541def 100644 --- a/src/sensors/doc/src/compatmap.qdoc +++ b/src/sensors/doc/src/compatmap.qdoc @@ -101,7 +101,7 @@ <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> - <td bgcolor="gray"></td> + <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="green"></td> </tr> @@ -173,7 +173,7 @@ <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="gray"></td> - <td bgcolor="gray"></td> + <td bgcolor="green"></td> <td bgcolor="gray"></td> <td bgcolor="green"></td> </tr> diff --git a/src/sensors/qsensor.cpp b/src/sensors/qsensor.cpp index bca6358b..fad1de2d 100644 --- a/src/sensors/qsensor.cpp +++ b/src/sensors/qsensor.cpp @@ -1010,7 +1010,7 @@ void QSensor::setUserOrientation(int userOrientation) This signal is emitted when the list of available sensors has changed. The sensors available to a program will not generally change over time - however some of the avilable sensors may represent hardware that is not + however some of the available sensors may represent hardware that is not permanently connected. For example, a game controller that is connected via bluetooth would become available when it was on and would become unavailable when it was off. |