diff options
| author | Wolfgang Beck <wolfgang.beck@nokia.com> | 2011-09-23 11:31:12 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-10-10 09:25:31 +1000 |
| commit | 4a3b4481ef9117965f68d7cf2ee0c5da940502f9 (patch) | |
| tree | f2f213ba73015cdb1b942b13c86ea0250e3a11f7 | |
| parent | 6b2c7688b3f344f350125f8b9713a6a77b82c3dd (diff) | |
MTMW-338 New QML El. should be in QtSensors 5.0 import
Change-Id: Ic08c60c2c008aefb03c3a6987882e9824713ae58
Reviewed-on: http://codereview.qt-project.org/5420
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Wolfgang Beck <wolfgang.beck@nokia.com>
| -rw-r--r-- | doc/src/imports/qml-qtsensors5.qdoc | 2 | ||||
| -rw-r--r-- | examples/sensors/qmlqtsensors5/main.qml | 2 | ||||
| -rw-r--r-- | src/imports/sensors2/sensors2.cpp | 2 | ||||
| -rw-r--r-- | src/imports/sensors2/sensors2.pro | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/imports/qml-qtsensors5.qdoc b/doc/src/imports/qml-qtsensors5.qdoc index a7ba0786..d77eeed5 100644 --- a/doc/src/imports/qml-qtsensors5.qdoc +++ b/doc/src/imports/qml-qtsensors5.qdoc @@ -45,7 +45,7 @@ \section1 Overview - The identifying string for this component is \i {"Qt.QtSensors"}. + The identifying string for this component is \i {"QtSensors"}. Use this in the QML \i {import} statement. The QML Sensors 5 Plugin provides an easy to use interface to the Sensors API. diff --git a/examples/sensors/qmlqtsensors5/main.qml b/examples/sensors/qmlqtsensors5/main.qml index 113c10b2..13c1cfe3 100644 --- a/examples/sensors/qmlqtsensors5/main.qml +++ b/examples/sensors/qmlqtsensors5/main.qml @@ -1,6 +1,6 @@ //Import the declarative plugins import QtQuick 2.0 -import Qt.QtSensors 5.0 +import QtSensors 5.0 /* Layout tiltrect diff --git a/src/imports/sensors2/sensors2.cpp b/src/imports/sensors2/sensors2.cpp index 9d79863d..259065d3 100644 --- a/src/imports/sensors2/sensors2.cpp +++ b/src/imports/sensors2/sensors2.cpp @@ -56,7 +56,7 @@ public: { qDebug() << "QSensors2DeclarativeModule::registerTypes(const char *uri)"; - Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.QtSensors")); + Q_ASSERT(QLatin1String(uri) == QLatin1String("QtSensors")); qmlRegisterType<QSensor2Tilt>(uri, 5, 0, "TiltSensor"); qmlRegisterType<QSensor2AmbientLight>(uri, 5, 0, "AmbientLightSensor"); qmlRegisterType<QSensor2Proximity>(uri, 5, 0, "ProximitySensor"); diff --git a/src/imports/sensors2/sensors2.pro b/src/imports/sensors2/sensors2.pro index a80446b3..4a812c7f 100644 --- a/src/imports/sensors2/sensors2.pro +++ b/src/imports/sensors2/sensors2.pro @@ -1,5 +1,5 @@ TARGET = declarative_qtsensors5 -TARGETPATH = Qt/QtSensors +TARGETPATH = QtSensors include(qsensors2import.pri) |