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, 2 insertions, 29 deletions

diff --git a/basicsuite/enterprise-gallery/PieMenuControlView.qml b/basicsuite/enterprise-gallery/PieMenuControlView.qml
index cba341b..2c06176 100644
--- a/basicsuite/enterprise-gallery/PieMenuControlView.qml
+++ b/basicsuite/enterprise-gallery/PieMenuControlView.qml
@@ -21,7 +21,7 @@
 import QtQuick 2.0
 import QtGraphicalEffects 1.0
 import QtQuick.Controls 1.0
-import QtQuick.Enterprise.Controls 1.0
+import QtQuick.Enterprise.Controls 1.1
 
 Rectangle {
     id: view
@@ -94,34 +94,7 @@ Rectangle {
             anchors.fill: parent
 
             onClicked: {
-                pieMenu.popup(touchArea.mouseX, touchArea.mouseY)
-            }
-        }
-
-        Item {
-            width: labelText.width
-            height: labelText.height
-            anchors.bottom: pieMenu.top
-            anchors.bottomMargin: 10
-            anchors.horizontalCenter: pieMenu.horizontalCenter
-            visible: pieMenu.visible
-
-            Item {
-                id: labelBlurGuard
-                anchors.centerIn: parent
-                width: labelText.implicitWidth * 2
-                height: labelText.implicitHeight * 2
-
-                Text {
-                    id: labelText
-                    font.pointSize: 20
-                    text: pieMenu.currentIndex !== -1 ? pieMenu.menuItems[pieMenu.currentIndex].text : ""
-                    horizontalAlignment: Text.AlignHCenter
-                    verticalAlignment: Text.AlignVCenter
-                    anchors.centerIn: parent
-                    color: "#ccc"
-                    antialiasing: true
-                }
+                pieMenu.popup(touchArea.mouseX, touchArea.mouseY);
             }
         }