summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-03-23 12:18:22 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-03-31 05:27:08 +0000
commitade72484f36a5c92c381398569a7864ed4bf6ba7 (patch)
tree272a7ccedd32b570fadd372f9379f5850c6ff2a1
parentec8974790e4129d802b187e7322c4c871a8ddbf2 (diff)
Don't mix pixel and point size
The view is rather obscured because of this. Every other font size in this example uses point size except for these two elements. This mix of point and pizel size is not permitted. There seems to be a warning and probably related change in Qt 5.5 as well. Change-Id: I36a7e9f1648d23f5bc737393ae735bbc7d04b494 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
-rw-r--r--examples/bluetooth/lowenergyscanner/assets/Header.qml2
-rw-r--r--examples/bluetooth/lowenergyscanner/assets/Label.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/bluetooth/lowenergyscanner/assets/Header.qml b/examples/bluetooth/lowenergyscanner/assets/Header.qml
index 0c8bc2c5..721dc05c 100644
--- a/examples/bluetooth/lowenergyscanner/assets/Header.qml
+++ b/examples/bluetooth/lowenergyscanner/assets/Header.qml
@@ -54,7 +54,7 @@ Rectangle {
anchors.fill: parent
text: headerText
font.bold: true
- font.pixelSize: 30
+ font.pointSize: 20
elide: Text.ElideMiddle
color: "#363636"
}
diff --git a/examples/bluetooth/lowenergyscanner/assets/Label.qml b/examples/bluetooth/lowenergyscanner/assets/Label.qml
index 5443ee6b..aafda900 100644
--- a/examples/bluetooth/lowenergyscanner/assets/Label.qml
+++ b/examples/bluetooth/lowenergyscanner/assets/Label.qml
@@ -42,7 +42,7 @@ import QtQuick 2.0
Text {
property string textContent: ""
- font.pixelSize: 30
+ font.pointSize: 20
anchors.horizontalCenter: parent.horizontalCenter
color: "#363636"
horizontalAlignment: Text.AlignHCenter