Merge branch 'stable' into releaseQtEE_v2.1.0

* stable: (21 commits)
  Revert "Show PieMenu in enterprise controls list view."
  Show PieMenu in enterprise controls list view.
  Fix PieMenu not showing in enterprise-gallery launcher demo.
  Update enterprise controls demos to version 1.1
  Revert "Add input field for decimal numbers"
  Doc: Update documentation version to 2.1.0
  [launchersettings] Fix UI scaling
  [about-b2qt] Use Screen element for setting width/height
  Change default font for demos to support arabic numbers
  [launchersettings] Small fixes in wifi settings section
  sensorexplorer: Use identifier field when description is empty
  Make sensors demo not rely on measurement errors
  Doc: Update screenshot for the textinput demo
  Remove incorrect assingment of QUrl to bool
  qt5-everywhere: update working radio playlist
  Show launchersettings and sensors demos in QtCreator
  Doc: Switch to use the global Qt template for example docs
  Updated preview_l.jpg for textinput demo
  Rearrange the order of demos in the launcher
  Merge updates from upstream into keyboard example
  ...

Change-Id: I83f65cb50cf53609d9bb131c94c3d020882a2ccd

1 files changed, 5 insertions, 2 deletions

diff --git a/basicsuite/launchersettings/main.qml b/basicsuite/launchersettings/main.qml
index 718bf69..dbd1a31 100644
--- a/basicsuite/launchersettings/main.qml
+++ b/basicsuite/launchersettings/main.qml
@@ -44,6 +44,7 @@ import QtQuick.Controls 1.0
 import QtQuick.Layouts 1.0
 import QtQuick.Controls.Styles 1.0
 import QtQuick.Controls.Private 1.0
+import QtQuick.Window 2.1
 
 Rectangle {
     id: root
@@ -73,7 +74,7 @@ Rectangle {
                         text: control.text
                         anchors.centerIn: parent
                         color: "white"
-                        font.pixelSize: 23
+                        font.pixelSize: 22
                         renderType: Text.NativeRendering
                     }
                 }
@@ -140,7 +141,8 @@ Rectangle {
 
         ColumnLayout {
             id: mainLayout
-            width: 800
+            // can not use size of "root" here, it will shrink UI when virtual keyboard is open
+            width: Math.min(Screen.width, Screen.height)
             height: implicitHeight
             anchors.left: parent.left
             anchors.right: parent.right
@@ -247,6 +249,7 @@ Rectangle {
                         id: hostnameButton
                         style: buttonStyle
                         text: "Change hostname"
+                        implicitWidth: 260
                         onClicked: networkControllerLoader.item.setHostname(hostname.text);
                         enabled: networkControllerLoader.item != undefined
                     }