mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

mobile: silence deprecated messages in logging about Kirigami.Label

Browse source 
Commit 8f6827ab12 brought a new SHA for Kirigami, but that introduces
a very noisy logging of "Kirigami.Label is deprecated. Use
QtQuickControls2.Label instead".

So, thats what done here.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
This commit is contained in:
Jan Mulder 2017-10-12 14:25:22 +02:00
parent f7da06c76b
commit d623eccdef
10 changed files with 142 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

41
mobile-widgets/qml/ThemeTest.qml
View file

@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
import QtQuick 2.5
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.0 as Controls
import QtQuick.Window 2.2
import org.kde.kirigami 2.0 as Kirigami
@ -27,31 +28,31 @@ Kirigami.Page {
id: fm
}
Kirigami.Label {
Controls.Label {
text: "Geometry (pixels):"
}
Kirigami.Label {
Controls.Label {
text: rootItem.width + "x" + rootItem.height
}
Kirigami.Label {
Controls.Label {
text: "Geometry (gridUnits):"
}
Kirigami.Label {
Controls.Label {
text: Math.round(rootItem.width / Kirigami.Units.gridUnit) + "x" + Math.round(rootItem.height / Kirigami.Units.gridUnit)
}
Kirigami.Label {
Controls.Label {
text: "Units.gridUnit:"
}
Kirigami.Label {
Controls.Label {
text: Kirigami.Units.gridUnit
}
Kirigami.Label {
Controls.Label {
text: "Units.devicePixelRatio:"
}
Kirigami.Label {
Controls.Label {
text: Screen.devicePixelRatio
}
@ -61,56 +62,56 @@ Kirigami.Page {
Layout.columnSpan: 2
}
Kirigami.Label {
Controls.Label {
text: "FontMetrics pointSize:"
}
Kirigami.Label {
Controls.Label {
text: fm.font.pointSize
}
Kirigami.Label {
Controls.Label {
text: "FontMetrics pixelSize:"
}
Kirigami.Label {
Controls.Label {
text: Number(fm.height).toFixed(2)
}
Kirigami.Label {
Controls.Label {
text: "FontMetrics devicePixelRatio:"
}
Kirigami.Label {
Controls.Label {
text: Number(fm.height / fm.font.pointSize).toFixed(2)
}
Kirigami.Label {
Controls.Label {
text: "Text item pixelSize:"
}
Text {
text: font.pixelSize
}
Kirigami.Label {
Controls.Label {
text: "Text item pointSize:"
}
Text {
text: font.pointSize
}
Kirigami.Label {
Controls.Label {
text: "Pixel density:"
}
Text {
text: Number(Screen.pixelDensity).toFixed(2)
}
Kirigami.Label {
Controls.Label {
text: "Height of default font:"
}
Text {
text: Number(font.pixelSize / Screen.pixelDensity).toFixed(2) + "mm"
}
Kirigami.Label {
Controls.Label {
text: "2cm x 2cm square:"
}
Rectangle {
@ -119,7 +120,7 @@ Kirigami.Page {
color: "black"
}
Kirigami.Label {
Controls.Label {
Layout.columnSpan: 2
Layout.fillHeight: true
}