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, 28 insertions, 0 deletions

diff --git a/basicsuite/enterprise-gallery/ControlLabel.qml b/basicsuite/enterprise-gallery/ControlLabel.qml
new file mode 100644
index 0000000..0335342
--- /dev/null
+++ b/basicsuite/enterprise-gallery/ControlLabel.qml
@@ -0,0 +1,28 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of the QtQuick Enterprise Controls Add-on.
+**
+** $QT_BEGIN_LICENSE$
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+
+Text {
+    font.pixelSize: Math.min(32, root.toPixels(0.045))
+    color: "#4e4e4e"
+    styleColor: "#ffffff"
+    style: Text.Raised
+}