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

7 files changed, 7 insertions, 7 deletions

diff --git a/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml b/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml
index 7958fca..632b63b 100644
--- a/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml
+++ b/basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.0
+import QtQuick.Enterprise.Controls.Styles 1.1
 
 CircularGaugeStyle {
     tickmarkInset: toPixels(0.04)
diff --git a/basicsuite/enterprise-dashboard/IconGaugeStyle.qml b/basicsuite/enterprise-dashboard/IconGaugeStyle.qml
index 0b24351..a04d0e9 100644
--- a/basicsuite/enterprise-dashboard/IconGaugeStyle.qml
+++ b/basicsuite/enterprise-dashboard/IconGaugeStyle.qml
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.0
+import QtQuick.Enterprise.Controls.Styles 1.1
 
 DashboardGaugeStyle {
     id: fuelGaugeStyle
diff --git a/basicsuite/enterprise-dashboard/TachometerStyle.qml b/basicsuite/enterprise-dashboard/TachometerStyle.qml
index c4649da..15a2601 100644
--- a/basicsuite/enterprise-dashboard/TachometerStyle.qml
+++ b/basicsuite/enterprise-dashboard/TachometerStyle.qml
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.0
+import QtQuick.Enterprise.Controls.Styles 1.1
 
 DashboardGaugeStyle {
     id: tachometerStyle
diff --git a/basicsuite/enterprise-dashboard/TurnIndicator.qml b/basicsuite/enterprise-dashboard/TurnIndicator.qml
index 9dd7d5f..22d0ea9 100644
--- a/basicsuite/enterprise-dashboard/TurnIndicator.qml
+++ b/basicsuite/enterprise-dashboard/TurnIndicator.qml
@@ -19,7 +19,7 @@
 ****************************************************************************/
 
 import QtQuick 2.0
-import QtQuick.Enterprise.Controls.Styles 1.0
+import QtQuick.Enterprise.Controls.Styles 1.1
 
 Item {
     // This enum is actually keyboard-related, but it serves its purpose
diff --git a/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf b/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf
new file mode 100644
index 0000000..19ed0b4
--- /dev/null
+++ b/basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf
diff --git a/basicsuite/enterprise-dashboard/main.qml b/basicsuite/enterprise-dashboard/main.qml
index da5f296..7f8ee75 100644
--- a/basicsuite/enterprise-dashboard/main.qml
+++ b/basicsuite/enterprise-dashboard/main.qml
@@ -22,8 +22,8 @@ import QtQuick 2.0
 import QtQuick.Window 2.1
 import QtQuick.Controls 1.0
 import QtQuick.Controls.Styles 1.0
-import QtQuick.Enterprise.Controls 1.0
-import QtQuick.Enterprise.Controls.Styles 1.0
+import QtQuick.Enterprise.Controls 1.1
+import QtQuick.Enterprise.Controls.Styles 1.1
 
 Rectangle {
     id: root
diff --git a/basicsuite/enterprise-dashboard/title.txt b/basicsuite/enterprise-dashboard/title.txt
index 1a3fb29..443fdd7 100644
--- a/basicsuite/enterprise-dashboard/title.txt
+++ b/basicsuite/enterprise-dashboard/title.txt
@@ -1 +1 @@
-Qt Quick Enterprise Controls - Dashboard
+060. Qt Quick Enterprise Controls - Dashboard