diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-06-17 17:19:40 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2010-06-17 17:19:40 +1000 |
| commit | ae30c7c6ed528f9d9de6c42afefae738e9b07536 (patch) | |
| tree | 6fe7df6224a5b3a524d807310bce782369cd2d66 /examples | |
| parent | 3af0dfc0479cf10a328ddf77b178feabc8977de6 (diff) | |
| parent | f85995b42283ac96a4d0d2d9a1c45a8e343f8756 (diff) | |
Merge branch 'sensors_1.0' into main_1.0
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/sensors/orientation/main.cpp | 11 | ||||
| -rw-r--r-- | examples/sensors/orientation/orientation.qml | 9 | ||||
| -rw-r--r-- | examples/sensors/small_screen_sensors/small_screen_sensors.pro | 2 |
3 files changed, 5 insertions, 17 deletions
diff --git a/examples/sensors/orientation/main.cpp b/examples/sensors/orientation/main.cpp index 2c5bd6537a..7bf4741b93 100644 --- a/examples/sensors/orientation/main.cpp +++ b/examples/sensors/orientation/main.cpp @@ -46,14 +46,6 @@ QTM_USE_NAMESPACE -QML_DECLARE_TYPE(QOrientationSensor) - -QML_DECLARE_TYPE(QSensorReading) - -QML_DECLARE_TYPE(QOrientationReading) -//### while we don't want to explicitly create this type in QML, we need to define it so -// we can specify enum values like OrientationReading.LeftUp - class MainWidget : public QWidget { Q_OBJECT @@ -80,9 +72,6 @@ MainWidget::MainWidget() int main(int argc, char *argv[]) { - qmlRegisterType<QOrientationReading>("Qt", 4, 6, "OrientationReading"); - qmlRegisterType<QOrientationSensor>("Qt", 4, 6, "OrientationSensor"); - QApplication app(argc, argv); MainWidget mainWidget; diff --git a/examples/sensors/orientation/orientation.qml b/examples/sensors/orientation/orientation.qml index 54faca3765..9f11d89648 100644 --- a/examples/sensors/orientation/orientation.qml +++ b/examples/sensors/orientation/orientation.qml @@ -38,7 +38,8 @@ ** ****************************************************************************/ -import Qt 4.6 +import Qt 4.7 +import QtMobility.sensors 1.0 Rectangle { width: 800 @@ -69,7 +70,6 @@ Rectangle { Item { id: content - transformOrigin: Item.Center anchors.centerIn: parent Text { id: text @@ -122,9 +122,8 @@ Rectangle { ] transitions: Transition { - NumberAnimation { matchProperties: "rotation"; easing: "InOutQuad"; duration: 400 } + NumberAnimation { properties: "rotation"; easing.type: Easing.OutBounce; duration: 400 } } } - - } + diff --git a/examples/sensors/small_screen_sensors/small_screen_sensors.pro b/examples/sensors/small_screen_sensors/small_screen_sensors.pro index f13a3c0c27..feadc6f965 100644 --- a/examples/sensors/small_screen_sensors/small_screen_sensors.pro +++ b/examples/sensors/small_screen_sensors/small_screen_sensors.pro @@ -1,4 +1,4 @@ -TARGET = SmallSensors +TARGET = smallsensors TEMPLATE = app include(../../examples.pri) |