diff options
Diffstat (limited to 'src/controls')
77 files changed, 82 insertions, 82 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 72834287..fa9225be 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -40,7 +40,7 @@ import QtQuick.Window 2.1 import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/BusyIndicator.qml b/src/controls/BusyIndicator.qml index 25eb6dc5..e995579d 100644 --- a/src/controls/BusyIndicator.qml +++ b/src/controls/BusyIndicator.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 /*! diff --git a/src/controls/Button.qml b/src/controls/Button.qml index afd7f381..facb711c 100644 --- a/src/controls/Button.qml +++ b/src/controls/Button.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 /*! diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml index 7249bd00..66b49345 100644 --- a/src/controls/CheckBox.qml +++ b/src/controls/CheckBox.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 /*! diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 20c4e1e5..c130abe8 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.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 /*! @@ -204,7 +204,7 @@ Control { \qml import QtQuick 2.2 - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 ComboBox { editable: true diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml index 5b3d31f6..9ed90fa5 100644 --- a/src/controls/GroupBox.qml +++ b/src/controls/GroupBox.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 QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.0 diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 4794c17f..0505a0a6 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml index 10f4ac25..0f9b502f 100644 --- a/src/controls/MenuBar.qml +++ b/src/controls/MenuBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Private/AbstractCheckable.qml b/src/controls/Private/AbstractCheckable.qml index 4a9547a7..1909e05c 100644 --- a/src/controls/Private/AbstractCheckable.qml +++ b/src/controls/Private/AbstractCheckable.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 /*! \qmltype AbstractCheckable diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml index 8bbc0b7e..849315e9 100644 --- a/src/controls/Private/BasicButton.qml +++ b/src/controls/Private/BasicButton.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 QtQuick.Controls.Styles 1.1 diff --git a/src/controls/Private/ColumnMenuContent.qml b/src/controls/Private/ColumnMenuContent.qml index 754ff141..ff608b47 100644 --- a/src/controls/Private/ColumnMenuContent.qml +++ b/src/controls/Private/ColumnMenuContent.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 Item { id: content diff --git a/src/controls/Private/FocusFrame.qml b/src/controls/Private/FocusFrame.qml index 1ad0af02..2262af72 100644 --- a/src/controls/Private/FocusFrame.qml +++ b/src/controls/Private/FocusFrame.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 /*! diff --git a/src/controls/Private/MenuContentItem.qml b/src/controls/Private/MenuContentItem.qml index 678426d5..dbbf26a9 100644 --- a/src/controls/Private/MenuContentItem.qml +++ b/src/controls/Private/MenuContentItem.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 Loader { diff --git a/src/controls/Private/MenuContentScroller.qml b/src/controls/Private/MenuContentScroller.qml index 0530cf6a..ccbeb55b 100644 --- a/src/controls/Private/MenuContentScroller.qml +++ b/src/controls/Private/MenuContentScroller.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 MouseArea { id: scrollIndicator diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml index 0bebd1eb..b96cd61d 100644 --- a/src/controls/Private/ScrollBar.qml +++ b/src/controls/Private/ScrollBar.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 /*! diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index a5455938..bd30ad8e 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.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 /*! diff --git a/src/controls/Private/StackViewSlideDelegate.qml b/src/controls/Private/StackViewSlideDelegate.qml index df5b60d2..dbacbffa 100644 --- a/src/controls/Private/StackViewSlideDelegate.qml +++ b/src/controls/Private/StackViewSlideDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 /*! \qmltype StackViewSlideTransition diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml index 5d2822b9..e99db169 100644 --- a/src/controls/Private/Style.qml +++ b/src/controls/Private/Style.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/Private/TabBar.qml b/src/controls/Private/TabBar.qml index 2af7d23c..29a40f3f 100644 --- a/src/controls/Private/TabBar.qml +++ b/src/controls/Private/TabBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 /*! \qmltype TabBar diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml index 01deac63..6a001f14 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.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 /*! diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml index 420ef2be..730e3448 100644 --- a/src/controls/RadioButton.qml +++ b/src/controls/RadioButton.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 /*! diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index c72277d8..b18ebee7 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.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 QtQuick.Controls.Styles 1.1 diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index 3dd70475..ffea986c 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.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 /*! diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index 26ba41b0..c5281586 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.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 /*! diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index 5318105c..dadff049 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 as Private import QtQuick.Window 2.1 diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml index e19189d0..2f3d5753 100644 --- a/src/controls/StackView.qml +++ b/src/controls/StackView.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 /*! diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml index af5870b0..be4791bb 100644 --- a/src/controls/StatusBar.qml +++ b/src/controls/StatusBar.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 /*! @@ -59,7 +59,7 @@ import QtQuick.Controls.Private 1.0 Otherwise the height is platform dependent. \code - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/src/controls/Styles/Base/BusyIndicatorStyle.qml b/src/controls/Styles/Base/BusyIndicatorStyle.qml index 6a6b36c0..03c3812e 100644 --- a/src/controls/Styles/Base/BusyIndicatorStyle.qml +++ b/src/controls/Styles/Base/BusyIndicatorStyle.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/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml index 7d4ae4d3..d0299a55 100644 --- a/src/controls/Styles/Base/ButtonStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml index f7e9bc7e..2dcaa9e9 100644 --- a/src/controls/Styles/Base/CheckBoxStyle.qml +++ b/src/controls/Styles/Base/CheckBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Window 2.1 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml index 9a0c80a6..0891392d 100644 --- a/src/controls/Styles/Base/ComboBoxStyle.qml +++ b/src/controls/Styles/Base/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.Styles 1.1 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Styles/Base/FocusFrameStyle.qml b/src/controls/Styles/Base/FocusFrameStyle.qml index d935251b..de988d40 100644 --- a/src/controls/Styles/Base/FocusFrameStyle.qml +++ b/src/controls/Styles/Base/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/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml index 45cce7c9..af8d41b6 100644 --- a/src/controls/Styles/Base/GroupBoxStyle.qml +++ b/src/controls/Styles/Base/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/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml index da8e1f97..8ab758f5 100644 --- a/src/controls/Styles/Base/MenuBarStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/MenuStyle.qml b/src/controls/Styles/Base/MenuStyle.qml index d1391ea1..0b1db87c 100644 --- a/src/controls/Styles/Base/MenuStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml index de05faa5..0a98beef 100644 --- a/src/controls/Styles/Base/ProgressBarStyle.qml +++ b/src/controls/Styles/Base/ProgressBarStyle.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 /*! diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml index c697decc..0f242eb0 100644 --- a/src/controls/Styles/Base/RadioButtonStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index 8e3e5efc..073a2e3f 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml index 11f3e15a..c03d96d5 100644 --- a/src/controls/Styles/Base/SliderStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml index 1d889b90..caa20abd 100644 --- a/src/controls/Styles/Base/SpinBoxStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/StatusBarStyle.qml b/src/controls/Styles/Base/StatusBarStyle.qml index 8e750519..78ea9b17 100644 --- a/src/controls/Styles/Base/StatusBarStyle.qml +++ b/src/controls/Styles/Base/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/Base/SwitchStyle.qml b/src/controls/Styles/Base/SwitchStyle.qml index 94e86270..01779582 100644 --- a/src/controls/Styles/Base/SwitchStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml index 758b6be6..dfb9b032 100644 --- a/src/controls/Styles/Base/TabViewStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml index 31ea5073..667841bb 100644 --- a/src/controls/Styles/Base/TableViewStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/TextAreaStyle.qml b/src/controls/Styles/Base/TextAreaStyle.qml index 91fc9489..7ad5686f 100644 --- a/src/controls/Styles/Base/TextAreaStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml index 3e371c8d..7dee691d 100644 --- a/src/controls/Styles/Base/TextFieldStyle.qml +++ b/src/controls/Styles/Base/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 /*! diff --git a/src/controls/Styles/Base/ToolBarStyle.qml b/src/controls/Styles/Base/ToolBarStyle.qml index 82ad4f1f..7a89cefb 100644 --- a/src/controls/Styles/Base/ToolBarStyle.qml +++ b/src/controls/Styles/Base/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/Base/ToolButtonStyle.qml b/src/controls/Styles/Base/ToolButtonStyle.qml index 9e4f3ccc..fc4dc606 100644 --- a/src/controls/Styles/Base/ToolButtonStyle.qml +++ b/src/controls/Styles/Base/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 /*! 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 { diff --git a/src/controls/Switch.qml b/src/controls/Switch.qml index f81991af..bafb567c 100644 --- a/src/controls/Switch.qml +++ b/src/controls/Switch.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 /*! diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml index b185c24c..8f09cf3c 100644 --- a/src/controls/TabView.qml +++ b/src/controls/TabView.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 /*! diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index a3da455e..dd4ee389 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.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 QtQuick.Controls.Styles 1.1 import QtQuick.Window 2.1 diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 82265075..a8be977d 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.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 /*! \qmltype TextArea diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index 49393d3f..70ed7bac 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.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 /*! @@ -382,7 +382,7 @@ Control { \code import QtQuick 2.2 - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 TextField { validator: IntValidator {bottom: 11; top: 31;} diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml index e3d5d3ea..90f9d4a3 100644 --- a/src/controls/ToolBar.qml +++ b/src/controls/ToolBar.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 /*! @@ -61,7 +61,7 @@ import QtQuick.Controls.Private 1.0 Otherwise the height is platform dependent. \code - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml index f1dec720..8bc466ea 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.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 /*! diff --git a/src/controls/controls.pro b/src/controls/controls.pro index e19d5d18..e7cd6ada 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -1,6 +1,6 @@ TARGET = qtquickcontrolsplugin TARGETPATH = QtQuick/Controls -IMPORT_VERSION = 1.1 +IMPORT_VERSION = 1.2 QT += qml quick gui-private core-private diff --git a/src/controls/doc/src/qtquickcontrols-overview.qdoc b/src/controls/doc/src/qtquickcontrols-overview.qdoc index 5dda0375..dc424673 100644 --- a/src/controls/doc/src/qtquickcontrols-overview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-overview.qdoc @@ -38,7 +38,7 @@ The QML types can be imported into your application using the following import statement in your \c {.qml} file. \code - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 \endcode \section1 Creating a basic example @@ -46,7 +46,7 @@ A basic example of a QML file that makes use of controls is shown here: \code - import QtQuick.Controls 1.1 + import QtQuick.Controls 1.2 ApplicationWindow { title: "My Application" |