summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-20 18:11:45 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-09-20 18:11:45 +0200
commitfc3b83939b10b3d7189b2d230a31c1e5663ae2d6 (patch)
tree6b6fb032b70cda6364b711ed3644dd082c979ec1
parentcee576d58b3e7d6ea8a9a5bff53bb86fc528cab9 (diff)
parente3e80980ca6a4628bf7a0dae61d9ab140913518c (diff)
Merge remote-tracking branch 'origin/stable' into devv5.2.0-alpha1
-rw-r--r--src/imports/sensors/qmlsensorglobal.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/sensors/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp
index 1cba256a..0acf397e 100644
--- a/src/imports/sensors/qmlsensorglobal.cpp
+++ b/src/imports/sensors/qmlsensorglobal.cpp
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
import QtSensors 5.0 as Sensors
...
Component.onCompleted: {
- var types = Sensors.sensorTypes();
+ var types = Sensors.QmlSensors.sensorTypes();
console.log(types.join(", "));
}
\endcode