diff options
Diffstat (limited to 'src')
83 files changed, 88 insertions, 88 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 728342877..fa9225be5 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 25eb6dc50..e995579d1 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 afd7f3818..facb711c3 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 7249bd001..66b49345d 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 20c4e1e56..c130abe8f 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 5b3d31f64..9ed90fa54 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 4794c17fa..0505a0a60 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 10f4ac254..0f9b502fa 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 4a9547a75..1909e05c2 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 8bbc0b7e9..849315e97 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 754ff141a..ff608b473 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 1ad0af029..2262af72e 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 678426d54..dbbf26a91 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 0530cf6a4..ccbeb55b4 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 0bebd1eba..b96cd61d9 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 a54559386..bd30ad8e3 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 df5b60d2f..dbacbffa6 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 5d2822b93..e99db1692 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 2af7d23ce..29a40f3fb 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 01deac63e..6a001f140 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 420ef2be7..730e3448f 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 c72277d8f..b18ebee74 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 3dd70475d..ffea986c4 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 26ba41b0c..c52815861 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 5318105c7..dadff0494 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 e19189d0d..2f3d57532 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 af5870b03..be4791bb3 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 6a6b36c0b..03c3812ec 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 7d4ae4d3b..d0299a55a 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 f7e9bc7e9..2dcaa9e93 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 9a0c80a62..0891392d5 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 d935251b0..de988d406 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 45cce7c9e..af8d41b68 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 da8e1f97d..8ab758f58 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 d1391ea1a..0b1db87cf 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 de05faa5d..0a98beefb 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 c697decc7..0f242eb09 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 8e3e5efcb..073a2e3fc 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 11f3e15a5..c03d96d58 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 1d889b908..caa20abd5 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 8e7505198..78ea9b17c 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 94e862704..017795823 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 758b6be6c..dfb9b0322 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 31ea5073d..667841bb5 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 91fc94897..7ad5686f9 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 3e371c8d4..7dee691db 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 82ad4f1f7..7a89cefba 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 9e4f3ccc8..fc4dc6062 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 07e1031b9..5703d405d 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 003d964aa..6bb336636 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 b01940d11..facc82235 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 e52235edb..ef55fc174 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 75c9de8fd..129890249 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 6218ce9bf..7ef760e2d 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 90ffa76d3..4a0d5894c 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 633002a89..bab4d41bb 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 55d3b60e6..49e3cace8 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 8fd559f4c..ac919bbaf 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 d11baad56..e15856856 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 56f1f62e6..ba897bfbd 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 0c4ba0209..8b0198150 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 54ce05538..6a5d59248 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 bde5e3f49..9244c7d8a 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 814618de6..33cc6779b 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 201dafa94..46750c1a3 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 77de5e5ab..c7e85ff48 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 eac5405ff..e019bda44 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 cc5736b12..59fc78247 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 f81991afa..bafb567cf 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 b185c24c4..8f09cf3cf 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 a3da455e9..dd4ee3890 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 822650754..a8be977d8 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 49393d3f8..70ed7baca 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 e3d5d3ea9..90f9d4a31 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 f1dec7202..8bc466eaf 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 e19d5d18d..e7cd6adaf 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 5dda0375b..dc424673d 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" diff --git a/src/dialogs/DefaultColorDialog.qml b/src/dialogs/DefaultColorDialog.qml index 14e1323e9..c2de493c6 100644 --- a/src/dialogs/DefaultColorDialog.qml +++ b/src/dialogs/DefaultColorDialog.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.0 import QtQuick.Window 2.1 import "qml" diff --git a/src/dialogs/DefaultDialogWrapper.qml b/src/dialogs/DefaultDialogWrapper.qml index 067771416..0771bdb92 100644 --- a/src/dialogs/DefaultDialogWrapper.qml +++ b/src/dialogs/DefaultDialogWrapper.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 diff --git a/src/dialogs/DefaultFileDialog.qml b/src/dialogs/DefaultFileDialog.qml index 767939b36..af5d7b0b6 100644 --- a/src/dialogs/DefaultFileDialog.qml +++ b/src/dialogs/DefaultFileDialog.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 as ControlsPrivate import QtQuick.Dialogs 1.1 import QtQuick.Dialogs.Private 1.1 diff --git a/src/dialogs/DefaultFontDialog.qml b/src/dialogs/DefaultFontDialog.qml index 2518ce95d..c8eccf3f1 100644 --- a/src/dialogs/DefaultFontDialog.qml +++ b/src/dialogs/DefaultFontDialog.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.0 import QtQuick.Dialogs 1.1 import QtQuick.Dialogs.Private 1.1 diff --git a/src/dialogs/DefaultMessageDialog.qml b/src/dialogs/DefaultMessageDialog.qml index 932dbfe35..5fa46cc33 100644 --- a/src/dialogs/DefaultMessageDialog.qml +++ b/src/dialogs/DefaultMessageDialog.qml @@ -39,7 +39,7 @@ *****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Dialogs 1.1 import QtQuick.Window 2.1 import "qml" diff --git a/src/layouts/doc/src/snippets/windowconstraints.qml b/src/layouts/doc/src/snippets/windowconstraints.qml index 5daf8a08e..956989a31 100644 --- a/src/layouts/doc/src/snippets/windowconstraints.qml +++ b/src/layouts/doc/src/snippets/windowconstraints.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 ApplicationWindow { |