diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-16 09:33:47 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-16 09:34:05 +0300 |
| commit | 6874ceb2b5525d108a0628bff437e697f0fca329 (patch) | |
| tree | ee3ecf25e20d02bd9c75bd7e9d1a238963c0e0bf /basicsuite/enterprise-dashboard/TachometerStyle.qml | |
| parent | 29e39084117802596fb838ce27d8a19493d969f3 (diff) | |
| parent | 63d998641077d9074281f402ae7becb41c037a2c (diff) | |
Merge branch 'stable' into dev
* 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: I6920592a9e91af2615f5e36a74cc3e8e6d42c56e
Diffstat (limited to 'basicsuite/enterprise-dashboard/TachometerStyle.qml')
| -rw-r--r-- | basicsuite/enterprise-dashboard/TachometerStyle.qml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |