From cca4531ecfc77cafd93dfab0548d8c8cb588e6d3 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Thu, 6 Oct 2016 14:34:51 +0200 Subject: add shared Label for examples, and use in the Window example It just saves the trouble of setting the Text color to the correct palette text color repeatedly, and avoids having black text on a dark background in case a dark theme is in use. Change-Id: If5c38fabe7f047fa5f6956a9d8b235886ab7ab5c Reviewed-by: Laszlo Agocs --- examples/quick/window/window.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'examples/quick/window/window.qml') diff --git a/examples/quick/window/window.qml b/examples/quick/window/window.qml index d50bce61b3..f3052a7d62 100644 --- a/examples/quick/window/window.qml +++ b/examples/quick/window/window.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2016 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. @@ -57,7 +57,7 @@ QtObject { anchors.margins: defaultSpacing spacing: defaultSpacing property real cellWidth: col.width / 3 - spacing - Text { text: "Control the second window:" } + Shared.Label { text: "Control the second window:" } Grid { id: grid columns: 3 @@ -121,7 +121,7 @@ QtObject { } return "unknown"; } - Text { + Shared.Label { id: visibilityLabel text: "second window is " + (testWindow.visible ? "visible" : "invisible") + " and has visibility " + parent.visibilityToString(testWindow.visibility) @@ -145,7 +145,7 @@ QtObject { Rectangle { anchors.fill: parent anchors.margins: defaultSpacing - Text { + Shared.Label { anchors.centerIn: parent text: "Second Window" } -- cgit v1.2.3