Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource

Conflicts solved in a file:
	dependencies.yaml

Change-Id: Id761143342b5c2b463a5de624dbba6ac0efef349

1 files changed, 5 insertions, 3 deletions

diff --git a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
index f30b1739..219f22d4 100644
--- a/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
+++ b/examples/datavisualization/qmlmultigraph/qml/qmlmultigraph/main.qml
@@ -38,6 +38,8 @@ Item {
     width: 800
     height: 600
 
+    property bool portratiMode: width < height
+
     Data {
         id: data
     }
@@ -102,7 +104,7 @@ Item {
                     Layout.minimumWidth: parent.width / 2
                     Layout.fillHeight: true
                     Layout.fillWidth: true
-                    text: "Clear Selections"
+                    text: portratiMode ? "Clear\nSelections" : "Clear Selections"
                     onClicked: clearSelections() // call a helper function to keep button itself simpler
                 }
 
@@ -117,14 +119,14 @@ Item {
                 Button {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
-                    text: "Reset Cameras"
+                    text: portratiMode ? "Reset\nCameras" : "Reset Cameras"
                     onClicked: resetCameras() // call a helper function to keep button itself simpler
                 }
 
                 Button {
                     Layout.fillHeight: true
                     Layout.fillWidth: true
-                    text: "Toggle Mesh Styles"
+                    text: portratiMode ? "Toggle\nMesh\nStyles" : "Toggle Mesh Styles"
                     onClicked: toggleMeshStyle() // call a helper function to keep button itself simpler
                 }
             }