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 <laszlo.agocs@qt.io>

3 files changed, 22 insertions, 21 deletions

diff --git a/examples/quick/window/ScreenInfo.qml b/examples/quick/window/ScreenInfo.qml
index ee0a31c794..7d7cd946c5 100644
--- a/examples/quick/window/ScreenInfo.qml
+++ b/examples/quick/window/ScreenInfo.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.
@@ -40,6 +40,7 @@
 
 import QtQuick 2.3
 import QtQuick.Window 2.1
+import "../shared" as Shared
 
 Item {
     id: root
@@ -70,32 +71,32 @@ Item {
         y: spacing
 
         //! [screen]
-        Text {
+        Shared.Label {
             text: "Screen \"" + Screen.name + "\":"
             font.bold: true
         }
         Item { width: 1; height: 1 } // spacer
 
-        Text { text: "dimensions" }
-        Text { text: Screen.width + "x" + Screen.height }
+        Shared.Label { text: "dimensions" }
+        Shared.Label { text: Screen.width + "x" + Screen.height }
 
-        Text { text: "pixel density" }
-        Text { text: Screen.pixelDensity.toFixed(2) + " dots/mm (" + (Screen.pixelDensity * 25.4).toFixed(2) + " dots/inch)" }
+        Shared.Label { text: "pixel density" }
+        Shared.Label { text: Screen.pixelDensity.toFixed(2) + " dots/mm (" + (Screen.pixelDensity * 25.4).toFixed(2) + " dots/inch)" }
 
-        Text { text: "logical pixel density" }
-        Text { text: Screen.logicalPixelDensity.toFixed(2) + " dots/mm (" + (Screen.logicalPixelDensity * 25.4).toFixed(2) + " dots/inch)" }
+        Shared.Label { text: "logical pixel density" }
+        Shared.Label { text: Screen.logicalPixelDensity.toFixed(2) + " dots/mm (" + (Screen.logicalPixelDensity * 25.4).toFixed(2) + " dots/inch)" }
 
-        Text { text: "device pixel ratio" }
-        Text { text: Screen.devicePixelRatio.toFixed(2) }
+        Shared.Label { text: "device pixel ratio" }
+        Shared.Label { text: Screen.devicePixelRatio.toFixed(2) }
 
-        Text { text: "available virtual desktop" }
-        Text { text: Screen.desktopAvailableWidth + "x" + Screen.desktopAvailableHeight }
+        Shared.Label { text: "available virtual desktop" }
+        Shared.Label { text: Screen.desktopAvailableWidth + "x" + Screen.desktopAvailableHeight }
 
-        Text { text: "orientation" }
-        Text { text: orientationToString(Screen.orientation) + " (" + Screen.orientation + ")" }
+        Shared.Label { text: "orientation" }
+        Shared.Label { text: orientationToString(Screen.orientation) + " (" + Screen.orientation + ")" }
 
-        Text { text: "primary orientation" }
-        Text { text: orientationToString(Screen.primaryOrientation) + " (" + Screen.primaryOrientation + ")" }
+        Shared.Label { text: "primary orientation" }
+        Shared.Label { text: orientationToString(Screen.primaryOrientation) + " (" + Screen.primaryOrientation + ")" }
         //! [screen]
     }
 }
diff --git a/examples/quick/window/Splash.qml b/examples/quick/window/Splash.qml
index 083c3babc8..3baf207992 100644
--- a/examples/quick/window/Splash.qml
+++ b/examples/quick/window/Splash.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.
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"
             }