From d220b4a8d017ef8b49089977cdb933e550c9051a Mon Sep 17 00:00:00 2001 From: Venugopal Shivashankar Date: Fri, 13 Nov 2020 13:30:10 +0100 Subject: Example: Drop "2" against "Qt Quick Controls" text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Topi Reiniö --- examples/quickcontrols2/gallery/gallery.qml | 11 +++++------ examples/quickcontrols2/imagine/automotive/qml/automotive.qml | 2 +- examples/quickcontrols2/imagine/musicplayer/musicplayer.qml | 2 +- examples/quickcontrols2/sidepanel/sidepanel.qml | 2 +- examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index 98551196..8a074254 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -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 } diff --git a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml index 88a7ba5f..ebf1a445 100644 --- a/examples/quickcontrols2/imagine/automotive/qml/automotive.qml +++ b/examples/quickcontrols2/imagine/automotive/qml/automotive.qml @@ -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" diff --git a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml index 61b295cd..1fa7bcf8 100644 --- a/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml +++ b/examples/quickcontrols2/imagine/musicplayer/musicplayer.qml @@ -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 diff --git a/examples/quickcontrols2/sidepanel/sidepanel.qml b/examples/quickcontrols2/sidepanel/sidepanel.qml index 68a8a170..33e85159 100644 --- a/examples/quickcontrols2/sidepanel/sidepanel.qml +++ b/examples/quickcontrols2/sidepanel/sidepanel.qml @@ -72,7 +72,7 @@ ApplicationWindow { Label { id: label anchors.centerIn: parent - text: "Qt Quick Controls 2" + text: "Qt Quick Controls" } } diff --git a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml index 9730ad09..7d7554f4 100644 --- a/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml +++ b/examples/quickcontrols2/texteditor/qml/+touch/texteditor.qml @@ -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") } } } -- cgit v1.2.3