diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-04-07 10:37:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-07 15:17:02 +0200 |
commit | 953b8d7ed82f2701ba8f6f572e60468da544c5ec (patch) | |
tree | a5f2d6b69c9f3ea65c427120f4f2c07d2d3db6e7 /src/controls/Styles/Desktop | |
parent | 9b206d4b0836f0f89aa667b44c6ac0a963808366 (diff) | |
download | qtquickcontrols-953b8d7ed82f2701ba8f6f572e60468da544c5ec.tar.gz |
Bump QtQuick.Controls import version to 1.2
Change-Id: Idc0b93cbfc2fe23e8be3bcaece672d06555a81f6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/controls/Styles/Desktop')
20 files changed, 20 insertions, 20 deletions
diff --git a/src/controls/Styles/Desktop/ButtonStyle.qml b/src/controls/Styles/Desktop/ButtonStyle.qml index 07e1031b..5703d405 100644 --- a/src/controls/Styles/Desktop/ButtonStyle.qml +++ b/src/controls/Styles/Desktop/ButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/CheckBoxStyle.qml b/src/controls/Styles/Desktop/CheckBoxStyle.qml index 003d964a..6bb33663 100644 --- a/src/controls/Styles/Desktop/CheckBoxStyle.qml +++ b/src/controls/Styles/Desktop/CheckBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml index b01940d1..facc8223 100644 --- a/src/controls/Styles/Desktop/ComboBoxStyle.qml +++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import "." as Desktop diff --git a/src/controls/Styles/Desktop/FocusFrameStyle.qml b/src/controls/Styles/Desktop/FocusFrameStyle.qml index e52235ed..ef55fc17 100644 --- a/src/controls/Styles/Desktop/FocusFrameStyle.qml +++ b/src/controls/Styles/Desktop/FocusFrameStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml index 75c9de8f..12989024 100644 --- a/src/controls/Styles/Desktop/GroupBoxStyle.qml +++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Styles/Desktop/MenuBarStyle.qml b/src/controls/Styles/Desktop/MenuBarStyle.qml index 6218ce9b..7ef760e2 100644 --- a/src/controls/Styles/Desktop/MenuBarStyle.qml +++ b/src/controls/Styles/Desktop/MenuBarStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import "." as Desktop diff --git a/src/controls/Styles/Desktop/MenuStyle.qml b/src/controls/Styles/Desktop/MenuStyle.qml index 90ffa76d..4a0d5894 100644 --- a/src/controls/Styles/Desktop/MenuStyle.qml +++ b/src/controls/Styles/Desktop/MenuStyle.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtQuick.Window 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ProgressBarStyle.qml b/src/controls/Styles/Desktop/ProgressBarStyle.qml index 633002a8..bab4d41b 100644 --- a/src/controls/Styles/Desktop/ProgressBarStyle.qml +++ b/src/controls/Styles/Desktop/ProgressBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/RadioButtonStyle.qml b/src/controls/Styles/Desktop/RadioButtonStyle.qml index 55d3b60e..49e3cace 100644 --- a/src/controls/Styles/Desktop/RadioButtonStyle.qml +++ b/src/controls/Styles/Desktop/RadioButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ScrollViewStyle.qml b/src/controls/Styles/Desktop/ScrollViewStyle.qml index 8fd559f4..ac919bba 100644 --- a/src/controls/Styles/Desktop/ScrollViewStyle.qml +++ b/src/controls/Styles/Desktop/ScrollViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/SliderStyle.qml b/src/controls/Styles/Desktop/SliderStyle.qml index d11baad5..e1585685 100644 --- a/src/controls/Styles/Desktop/SliderStyle.qml +++ b/src/controls/Styles/Desktop/SliderStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml index 56f1f62e..ba897bfb 100644 --- a/src/controls/Styles/Desktop/SpinBoxStyle.qml +++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/StatusBarStyle.qml b/src/controls/Styles/Desktop/StatusBarStyle.qml index 0c4ba020..8b019815 100644 --- a/src/controls/Styles/Desktop/StatusBarStyle.qml +++ b/src/controls/Styles/Desktop/StatusBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Desktop/SwitchStyle.qml b/src/controls/Styles/Desktop/SwitchStyle.qml index 54ce0553..6a5d5924 100644 --- a/src/controls/Styles/Desktop/SwitchStyle.qml +++ b/src/controls/Styles/Desktop/SwitchStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.1 diff --git a/src/controls/Styles/Desktop/TabViewStyle.qml b/src/controls/Styles/Desktop/TabViewStyle.qml index bde5e3f4..9244c7d8 100644 --- a/src/controls/Styles/Desktop/TabViewStyle.qml +++ b/src/controls/Styles/Desktop/TabViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.1 Style { diff --git a/src/controls/Styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml index 814618de..33cc6779 100644 --- a/src/controls/Styles/Desktop/TableViewStyle.qml +++ b/src/controls/Styles/Desktop/TableViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 import "." diff --git a/src/controls/Styles/Desktop/TextAreaStyle.qml b/src/controls/Styles/Desktop/TextAreaStyle.qml index 201dafa9..46750c1a 100644 --- a/src/controls/Styles/Desktop/TextAreaStyle.qml +++ b/src/controls/Styles/Desktop/TextAreaStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 ScrollViewStyle { diff --git a/src/controls/Styles/Desktop/TextFieldStyle.qml b/src/controls/Styles/Desktop/TextFieldStyle.qml index 77de5e5a..c7e85ff4 100644 --- a/src/controls/Styles/Desktop/TextFieldStyle.qml +++ b/src/controls/Styles/Desktop/TextFieldStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ToolBarStyle.qml b/src/controls/Styles/Desktop/ToolBarStyle.qml index eac5405f..e019bda4 100644 --- a/src/controls/Styles/Desktop/ToolBarStyle.qml +++ b/src/controls/Styles/Desktop/ToolBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Styles/Desktop/ToolButtonStyle.qml b/src/controls/Styles/Desktop/ToolButtonStyle.qml index cc5736b1..59fc7824 100644 --- a/src/controls/Styles/Desktop/ToolButtonStyle.qml +++ b/src/controls/Styles/Desktop/ToolButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Private 1.0 Style { |