diff options
author | Leena Miettinen <riitta-leena.miettinen@nokia.com> | 2011-11-01 13:27:03 +0100 |
---|---|---|
committer | Leena Miettinen <riitta-leena.miettinen@nokia.com> | 2011-11-01 13:49:11 +0100 |
commit | 37720c40080c89e84b220b5917e7f1ac6c6caee2 (patch) | |
tree | 47e42e5a15544821e88cdedfcaae39d01fc4246b /doc/examples | |
parent | 1d97b604c076c41a0b111922b0046690096a9562 (diff) | |
download | qt-creator-37720c40080c89e84b220b5917e7f1ac6c6caee2.tar.gz |
Doc: update example to use Qt Mobility API 1.2
Task-number: QTCREATORBUG-6270
Change-Id: I2c65d7ec2df856ed0145468be1497b7dc5ac76a1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Diffstat (limited to 'doc/examples')
-rw-r--r-- | doc/examples/batterystatus/BatteryStatus.pro | 71 | ||||
-rw-r--r-- | doc/examples/batterystatus/qml/BatteryStatus/MainPage.qml | 18 |
2 files changed, 42 insertions, 47 deletions
diff --git a/doc/examples/batterystatus/BatteryStatus.pro b/doc/examples/batterystatus/BatteryStatus.pro index a5a6df68f1..c3c7792f57 100644 --- a/doc/examples/batterystatus/BatteryStatus.pro +++ b/doc/examples/batterystatus/BatteryStatus.pro @@ -1,40 +1,37 @@ -/*************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (info@qt.nokia.com) -** -** This file is part of the documentation of Qt Creator. -** -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -****************************************************************************/ + +# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# Contact: Nokia Corporation (info@qt.nokia.com) +# +# This file is part of the documentation of Qt Creator. +# +# You may use this file under the terms of the BSD license as follows: +# +# "Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor +# the names of its contributors may be used to endorse or promote +# products derived from this software without specific prior written +# permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." # Add more folders to ship with the application, here folder_01.source = qml/BatteryStatus diff --git a/doc/examples/batterystatus/qml/BatteryStatus/MainPage.qml b/doc/examples/batterystatus/qml/BatteryStatus/MainPage.qml index 2959ad190a..df02829d0a 100644 --- a/doc/examples/batterystatus/qml/BatteryStatus/MainPage.qml +++ b/doc/examples/batterystatus/qml/BatteryStatus/MainPage.qml @@ -35,10 +35,14 @@ ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." ** ****************************************************************************/ +//! [3] +import QtQuick 1.1 +import com.nokia.symbian 1.1 +//! [3] -import QtQuick 1.0 -import com.nokia.symbian 1.0 -import QtMobility.systeminfo 1.1 +//! [4] +import QtMobility.systeminfo 1.2 +//! [4] //! [0] Page { @@ -46,13 +50,7 @@ Page { DeviceInfo { id: deviceinfo - - Component.onCompleted: { - deviceinfo.startBatteryLevelChanged(); - } - onBatteryLevelChanged: { - progressbar1.value = batteryLevel - } + monitorBatteryLevelChanges: true } //! [0] |