summaryrefslogtreecommitdiffstats
path: root/examples/sensors/qmlqtsensors/components
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-05-27 10:49:16 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-27 11:07:13 +0200
commit325ba699f06c9ee8a97a992482a295a96cc9d809 (patch)
tree297088cfadb85ac14b7f1b30f60d971464a81245 /examples/sensors/qmlqtsensors/components
parent75aff41f72a2e538ec62b97deaf1cb5e8afd64c5 (diff)
Doc: Fix errors in Qt Sensors QML example
This change fixes the errors in example QML code by replacing the overuse of anchors with Column/Row components, and cleaning up by refactoring reusable code into a new QML type. Task-number: QTBUG-31076 Change-Id: Iade6f98d7db716848c44d4066aa23064929b32f2 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Diffstat (limited to 'examples/sensors/qmlqtsensors/components')
-rw-r--r--examples/sensors/qmlqtsensors/components/ApplicationWindow.qml4
-rw-r--r--examples/sensors/qmlqtsensors/components/Divider.qml61
2 files changed, 62 insertions, 3 deletions
diff --git a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml b/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml
index 06654e41..bf130dcd 100644
--- a/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml
+++ b/examples/sensors/qmlqtsensors/components/ApplicationWindow.qml
@@ -43,9 +43,7 @@ import QtQuick 2.0
Rectangle {
id: appWnd
- x: 0
- y: 0
width: 320
height: 480
- color: "#ececec"
+ color: "#868482"
}
diff --git a/examples/sensors/qmlqtsensors/components/Divider.qml b/examples/sensors/qmlqtsensors/components/Divider.qml
new file mode 100644
index 00000000..225b01fa
--- /dev/null
+++ b/examples/sensors/qmlqtsensors/components/Divider.qml
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtSensors module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** 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 Digia Plc 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."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Column {
+ spacing: 5
+ width: parent.width
+ property alias label: textLabel.text
+
+ Rectangle {
+ border.width: 1
+ height: 2
+ width: parent.width
+ anchors.margins: 20
+ border.color: "#2d2b19"
+ }
+ Text {
+ id: textLabel
+ width: parent.width
+ horizontalAlignment: Text.AlignHCenter
+ font.bold: true
+ }
+}