diff options
author | Gatis Paeglis <gatis.paeglis@digia.com> | 2014-04-10 15:18:26 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@digia.com> | 2014-04-10 20:36:34 +0300 |
commit | a7353367b7d29eacc70ea960409e8eb682fe4e9c (patch) | |
tree | 9adc45839a7a55429d484934db1a1e2698d095a6 /basicsuite/enterprise-dashboard | |
parent | f82822d73ed03b5e971a940bcf9e13d11128b1a9 (diff) |
Update enterprise controls demos to version 1.1
Task-number: QTEE-482
Change-Id: I79f665de133cbe1c77962a8d93acdddd2e05fcc1
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Diffstat (limited to 'basicsuite/enterprise-dashboard')
-rw-r--r-- | basicsuite/enterprise-dashboard/DashboardGaugeStyle.qml | 2 | ||||
-rw-r--r-- | basicsuite/enterprise-dashboard/IconGaugeStyle.qml | 2 | ||||
-rw-r--r-- | basicsuite/enterprise-dashboard/TachometerStyle.qml | 2 | ||||
-rw-r--r-- | basicsuite/enterprise-dashboard/TurnIndicator.qml | 2 | ||||
-rw-r--r-- | basicsuite/enterprise-dashboard/fonts/DejaVuSans.ttf | bin | 0 -> 720856 bytes | |||
-rw-r--r-- | basicsuite/enterprise-dashboard/main.qml | 4 |
6 files changed, 6 insertions, 6 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 Binary files differnew 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 |