summaryrefslogtreecommitdiff
path: root/src/controls/Styles/Desktop
diff options
context:
space:
mode:
authorJens Bache-Wiig <jens.bache-wiig@digia.com>2013-08-30 12:13:31 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-10 11:20:29 +0200
commit0e4a9eba4052c4ad447b06c4575c30f77b4f3237 (patch)
treec56717ed57ce17ac96cde788b1c92e4879375428 /src/controls/Styles/Desktop
parent37b0b8176537923ec77621c114e8ac2deb307b33 (diff)
downloadqtquickcontrols-0e4a9eba4052c4ad447b06c4575c30f77b4f3237.tar.gz
Update imports to 1.1 and remove version from qmlmodule definition
Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src/controls/Styles/Desktop')
-rw-r--r--src/controls/Styles/Desktop/ButtonStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/CheckBoxStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/ComboBoxStyle.qml4
-rw-r--r--src/controls/Styles/Desktop/FocusFrameStyle.qml4
-rw-r--r--src/controls/Styles/Desktop/GroupBoxStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/MenuBarStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/MenuStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/ProgressBarStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/RadioButtonStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/ScrollViewStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/SliderStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/SpinBoxStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/StatusBarStyle.qml4
-rw-r--r--src/controls/Styles/Desktop/TabViewStyle.qml4
-rw-r--r--src/controls/Styles/Desktop/TableViewStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/TextFieldStyle.qml2
-rw-r--r--src/controls/Styles/Desktop/ToolBarStyle.qml4
-rw-r--r--src/controls/Styles/Desktop/ToolButtonStyle.qml2
18 files changed, 23 insertions, 23 deletions
diff --git a/src/controls/Styles/Desktop/ButtonStyle.qml b/src/controls/Styles/Desktop/ButtonStyle.qml
index 2385873e..33e8f0ee 100644
--- a/src/controls/Styles/Desktop/ButtonStyle.qml
+++ b/src/controls/Styles/Desktop/ButtonStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/CheckBoxStyle.qml b/src/controls/Styles/Desktop/CheckBoxStyle.qml
index 6bbb5b1d..2cc688a7 100644
--- a/src/controls/Styles/Desktop/CheckBoxStyle.qml
+++ b/src/controls/Styles/Desktop/CheckBoxStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml
index 95397641..91a8e82c 100644
--- a/src/controls/Styles/Desktop/ComboBoxStyle.qml
+++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml
@@ -38,8 +38,8 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls 1.1
+import QtQuick.Controls.Styles 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/FocusFrameStyle.qml b/src/controls/Styles/Desktop/FocusFrameStyle.qml
index 420a0ab5..0bea860e 100644
--- a/src/controls/Styles/Desktop/FocusFrameStyle.qml
+++ b/src/controls/Styles/Desktop/FocusFrameStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype FocusFrameStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
StyleItem {
property int margin: -3
diff --git a/src/controls/Styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml
index 835dd718..0be0a8d6 100644
--- a/src/controls/Styles/Desktop/GroupBoxStyle.qml
+++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/MenuBarStyle.qml b/src/controls/Styles/Desktop/MenuBarStyle.qml
index 291df0fb..41098972 100644
--- a/src/controls/Styles/Desktop/MenuBarStyle.qml
+++ b/src/controls/Styles/Desktop/MenuBarStyle.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
diff --git a/src/controls/Styles/Desktop/MenuStyle.qml b/src/controls/Styles/Desktop/MenuStyle.qml
index 960a163d..2e3296b6 100644
--- a/src/controls/Styles/Desktop/MenuStyle.qml
+++ b/src/controls/Styles/Desktop/MenuStyle.qml
@@ -39,7 +39,7 @@
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/ProgressBarStyle.qml b/src/controls/Styles/Desktop/ProgressBarStyle.qml
index 834b8ab3..70fa0402 100644
--- a/src/controls/Styles/Desktop/ProgressBarStyle.qml
+++ b/src/controls/Styles/Desktop/ProgressBarStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/RadioButtonStyle.qml b/src/controls/Styles/Desktop/RadioButtonStyle.qml
index b41b959a..34d1efa8 100644
--- a/src/controls/Styles/Desktop/RadioButtonStyle.qml
+++ b/src/controls/Styles/Desktop/RadioButtonStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/ScrollViewStyle.qml b/src/controls/Styles/Desktop/ScrollViewStyle.qml
index ff03b3c3..9342d524 100644
--- a/src/controls/Styles/Desktop/ScrollViewStyle.qml
+++ b/src/controls/Styles/Desktop/ScrollViewStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/SliderStyle.qml b/src/controls/Styles/Desktop/SliderStyle.qml
index e435205e..fd426e35 100644
--- a/src/controls/Styles/Desktop/SliderStyle.qml
+++ b/src/controls/Styles/Desktop/SliderStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml
index 24f51427..6fdd407e 100644
--- a/src/controls/Styles/Desktop/SpinBoxStyle.qml
+++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/StatusBarStyle.qml b/src/controls/Styles/Desktop/StatusBarStyle.qml
index 930ca773..cb3cde47 100644
--- a/src/controls/Styles/Desktop/StatusBarStyle.qml
+++ b/src/controls/Styles/Desktop/StatusBarStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype StatusBarStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Style {
diff --git a/src/controls/Styles/Desktop/TabViewStyle.qml b/src/controls/Styles/Desktop/TabViewStyle.qml
index 51b70ea4..01851711 100644
--- a/src/controls/Styles/Desktop/TabViewStyle.qml
+++ b/src/controls/Styles/Desktop/TabViewStyle.qml
@@ -38,9 +38,9 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
-import QtQuick.Controls.Styles 1.0
+import QtQuick.Controls.Styles 1.1
Style {
id: root
diff --git a/src/controls/Styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml
index 171678a3..d588202d 100644
--- a/src/controls/Styles/Desktop/TableViewStyle.qml
+++ b/src/controls/Styles/Desktop/TableViewStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
ScrollViewStyle {
diff --git a/src/controls/Styles/Desktop/TextFieldStyle.qml b/src/controls/Styles/Desktop/TextFieldStyle.qml
index 53282887..10bcab68 100644
--- a/src/controls/Styles/Desktop/TextFieldStyle.qml
+++ b/src/controls/Styles/Desktop/TextFieldStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {
diff --git a/src/controls/Styles/Desktop/ToolBarStyle.qml b/src/controls/Styles/Desktop/ToolBarStyle.qml
index c295f731..48825fc7 100644
--- a/src/controls/Styles/Desktop/ToolBarStyle.qml
+++ b/src/controls/Styles/Desktop/ToolBarStyle.qml
@@ -38,13 +38,13 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
/*!
\qmltype StatusBarStyle
\internal
- \inqmlmodule QtQuick.Controls.Styles 1.0
+ \inqmlmodule QtQuick.Controls.Styles
*/
Style {
diff --git a/src/controls/Styles/Desktop/ToolButtonStyle.qml b/src/controls/Styles/Desktop/ToolButtonStyle.qml
index 25529f11..464210d8 100644
--- a/src/controls/Styles/Desktop/ToolButtonStyle.qml
+++ b/src/controls/Styles/Desktop/ToolButtonStyle.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
import QtQuick 2.1
-import QtQuick.Controls 1.0
+import QtQuick.Controls 1.1
import QtQuick.Controls.Private 1.0
Style {