Example: Drop "2" against "Qt Quick Controls" text
This should ensure that the examples give the same message as the documentation. In addition, dropped a phrase about Qt Quick Controls claiming that it is designed for mobile and embedded. The latest version of controls covers the entire spectrum. Change-Id: Ia856fa47a6e6fc35f80bedc549378a00c7fbbc2a Pick-to: 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
This commit is contained in:
parent
ca74710e1f
commit
d220b4a8d0
|
@ -60,7 +60,7 @@ ApplicationWindow {
|
|||
width: 360
|
||||
height: 520
|
||||
visible: true
|
||||
title: "Qt Quick Controls 2"
|
||||
title: "Qt Quick Controls"
|
||||
|
||||
function help() {
|
||||
let displayingControl = listView.currentIndex !== -1
|
||||
|
@ -232,7 +232,7 @@ ApplicationWindow {
|
|||
}
|
||||
|
||||
Label {
|
||||
text: "Qt Quick Controls 2 provides a set of controls that can be used to build complete interfaces in Qt Quick."
|
||||
text: "Qt Quick Controls provides a set of controls that can be used to build complete interfaces in Qt Quick."
|
||||
anchors.margins: 20
|
||||
anchors.top: logo.bottom
|
||||
anchors.left: parent.left
|
||||
|
@ -323,16 +323,15 @@ ApplicationWindow {
|
|||
|
||||
Label {
|
||||
width: aboutDialog.availableWidth
|
||||
text: "The Qt Quick Controls 2 module delivers the next generation user interface controls based on Qt Quick."
|
||||
text: "The Qt Quick Controls module delivers the next generation user interface controls based on Qt Quick."
|
||||
wrapMode: Label.Wrap
|
||||
font.pixelSize: 12
|
||||
}
|
||||
|
||||
Label {
|
||||
width: aboutDialog.availableWidth
|
||||
text: "In comparison to the desktop-oriented Qt Quick Controls 1, Qt Quick Controls 2 "
|
||||
+ "are an order of magnitude simpler, lighter and faster, and are primarily targeted "
|
||||
+ "towards embedded and mobile platforms."
|
||||
text: "In comparison to Qt Quick Controls 1, Qt Quick Controls "
|
||||
+ "are an order of magnitude simpler, lighter, and faster."
|
||||
wrapMode: Label.Wrap
|
||||
font.pixelSize: 12
|
||||
}
|
||||
|
|
|
@ -61,7 +61,7 @@ ApplicationWindow {
|
|||
minimumWidth: 1180
|
||||
minimumHeight: 663
|
||||
visible: true
|
||||
title: "Qt Quick Controls 2 - Imagine Style Example: Automotive"
|
||||
title: "Qt Quick Controls - Imagine Style Example: Automotive"
|
||||
|
||||
readonly property color colorGlow: "#1d6d64"
|
||||
readonly property color colorWarning: "#d5232f"
|
||||
|
|
|
@ -58,7 +58,7 @@ ApplicationWindow {
|
|||
width: 1280
|
||||
height: 720
|
||||
visible: true
|
||||
title: "Qt Quick Controls 2 - Imagine Style Example: Music Player"
|
||||
title: "Qt Quick Controls - Imagine Style Example: Music Player"
|
||||
|
||||
Component.onCompleted: {
|
||||
x = Screen.width / 2 - width / 2
|
||||
|
|
|
@ -72,7 +72,7 @@ ApplicationWindow {
|
|||
Label {
|
||||
id: label
|
||||
anchors.centerIn: parent
|
||||
text: "Qt Quick Controls 2"
|
||||
text: "Qt Quick Controls"
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -261,7 +261,7 @@ ApplicationWindow {
|
|||
y: parent.height / 2 - height / 2
|
||||
|
||||
contentItem: Label {
|
||||
text: qsTr("Qt Quick Controls 2 - Text Editor Example")
|
||||
text: qsTr("Qt Quick Controls - Text Editor Example")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue