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, 6 insertions, 6 deletions

diff --git a/basicsuite/enterprise-gallery/CircularGaugeView.qml b/basicsuite/enterprise-gallery/CircularGaugeView.qml
index 92ee6c5..a24b980 100644
--- a/basicsuite/enterprise-gallery/CircularGaugeView.qml
+++ b/basicsuite/enterprise-gallery/CircularGaugeView.qml
@@ -20,7 +20,7 @@
 
 import QtQuick 2.0
 import QtQuick.Controls 1.0
-import QtQuick.Enterprise.Controls 1.0
+import QtQuick.Enterprise.Controls 1.1
 
 ControlView {
     id: controlView
@@ -66,8 +66,8 @@ ControlView {
         id: gauge
         minimumValue: customizerItem.minimumValue
         maximumValue: customizerItem.maximumValue
-        width: root.toPixels(0.65)
-        height: width
+        width: controlBounds.width
+        height: controlBounds.height
 
         value: accelerating ? maximumValue : 0
         style: styleMap[customizerItem.currentStylePath]
@@ -174,7 +174,7 @@ ControlView {
             minimumValue: 0
             value: 0
             maximumValue: 360
-            stepSize: labelStepSizeSlider.stepSize
+            stepSize: 1
         }
 
         CustomizerLabel {
@@ -184,9 +184,9 @@ ControlView {
         CustomizerSlider {
             id: maximumValueSlider
             minimumValue: 0
-            value: 220
+            value: 240
             maximumValue: 300
-            stepSize: labelStepSizeSlider.stepSize
+            stepSize: 1
         }
 
         CustomizerLabel {