diff options
136 files changed, 158 insertions, 158 deletions
diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml index 74b05956..c4094209 100644 --- a/examples/gallery/content/ChildWindow.qml +++ b/examples/gallery/content/ChildWindow.qml @@ -42,8 +42,8 @@ -import QtQuick 2.0 -import QtQuick.Window 2.0 +import QtQuick 2.1 +import QtQuick.Window 2.1 import QtQuick.Controls 1.0 Window { diff --git a/examples/gallery/content/Controls.qml b/examples/gallery/content/Controls.qml index 0a2c74ab..ff4c370a 100644 --- a/examples/gallery/content/Controls.qml +++ b/examples/gallery/content/Controls.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/examples/gallery/content/ModelView.qml b/examples/gallery/content/ModelView.qml index cd731ca9..81bd9f7b 100644 --- a/examples/gallery/content/ModelView.qml +++ b/examples/gallery/content/ModelView.qml @@ -42,9 +42,9 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 -//import QtQuick.XmlListModel 2.0 +//import QtQuick.XmlListModel 2.1 Item { id: root diff --git a/examples/gallery/content/Panel.qml b/examples/gallery/content/Panel.qml index 60905fd7..9cfc7250 100644 --- a/examples/gallery/content/Panel.qml +++ b/examples/gallery/content/Panel.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 Rectangle { diff --git a/examples/gallery/content/Styles.qml b/examples/gallery/content/Styles.qml index 2950ef17..8aeb0345 100644 --- a/examples/gallery/content/Styles.qml +++ b/examples/gallery/content/Styles.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/examples/gallery/main.qml b/examples/gallery/main.qml index 1db94223..911cbe1d 100644 --- a/examples/gallery/main.qml +++ b/examples/gallery/main.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 diff --git a/examples/splitters/main.qml b/examples/splitters/main.qml index 0d35ae71..1df39a82 100644 --- a/examples/splitters/main.qml +++ b/examples/splitters/main.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 diff --git a/examples/tableview/main.qml b/examples/tableview/main.qml index 8624120c..e1d38d40 100644 --- a/examples/tableview/main.qml +++ b/examples/tableview/main.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import QtQuick.XmlListModel 2.0 diff --git a/examples/touch/content/AndroidDelegate.qml b/examples/touch/content/AndroidDelegate.qml index c51fe07a..36a439a8 100644 --- a/examples/touch/content/AndroidDelegate.qml +++ b/examples/touch/content/AndroidDelegate.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 Item { id: root diff --git a/examples/touch/content/ButtonPage.qml b/examples/touch/content/ButtonPage.qml index dbe77836..ff86c814 100644 --- a/examples/touch/content/ButtonPage.qml +++ b/examples/touch/content/ButtonPage.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/examples/touch/content/ProgressBarPage.qml b/examples/touch/content/ProgressBarPage.qml index d5b1a590..abbf78fc 100644 --- a/examples/touch/content/ProgressBarPage.qml +++ b/examples/touch/content/ProgressBarPage.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/examples/touch/content/SliderPage.qml b/examples/touch/content/SliderPage.qml index 2651837f..d90a3c2c 100644 --- a/examples/touch/content/SliderPage.qml +++ b/examples/touch/content/SliderPage.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/examples/touch/content/TabBarPage.qml b/examples/touch/content/TabBarPage.qml index 4edbaabd..0a47308b 100644 --- a/examples/touch/content/TabBarPage.qml +++ b/examples/touch/content/TabBarPage.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/examples/touch/content/TextInputPage.qml b/examples/touch/content/TextInputPage.qml index fd84d05e..e363648b 100644 --- a/examples/touch/content/TextInputPage.qml +++ b/examples/touch/content/TextInputPage.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/examples/touch/main.qml b/examples/touch/main.qml index 05ad18f8..3ce116f3 100644 --- a/examples/touch/main.qml +++ b/examples/touch/main.qml @@ -42,7 +42,7 @@ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import "content" diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 03eb8acb..48d5ffeb 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 import QtQuick.Window 2.1 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Button.qml b/src/controls/Button.qml index 57b5b355..5317e614 100644 --- a/src/controls/Button.qml +++ b/src/controls/Button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml index 542d0f3e..c459e812 100644 --- a/src/controls/CheckBox.qml +++ b/src/controls/CheckBox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index e76e1f5a..14dca758 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml index e7cf4864..0571d1fb 100644 --- a/src/controls/GroupBox.qml +++ b/src/controls/GroupBox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/Label.qml b/src/controls/Label.qml index 460e77ce..e983ecc7 100644 --- a/src/controls/Label.qml +++ b/src/controls/Label.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 /*! \qmltype Label diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 8641a0e1..ddbef1ae 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml index 9abe5cea..e03ae487 100644 --- a/src/controls/MenuBar.qml +++ b/src/controls/MenuBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Page.qml b/src/controls/Page.qml index 7ab9194c..4295f65c 100644 --- a/src/controls/Page.qml +++ b/src/controls/Page.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/controls/PageAnimation.qml b/src/controls/PageAnimation.qml index 0481e5f8..2e9c3f0f 100644 --- a/src/controls/PageAnimation.qml +++ b/src/controls/PageAnimation.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 ParallelAnimation { id: root diff --git a/src/controls/PageStack.qml b/src/controls/PageStack.qml index c40f22ea..89cf0170 100644 --- a/src/controls/PageStack.qml +++ b/src/controls/PageStack.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Private/PageStack.js" as JSArray diff --git a/src/controls/PageTransition.qml b/src/controls/PageTransition.qml index 6f827f90..bb212b0c 100644 --- a/src/controls/PageTransition.qml +++ b/src/controls/PageTransition.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 /*! \qmltype PageTransition diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml index 1f4e6bf3..e49ae8be 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml index 47eab5ee..bfb37a60 100644 --- a/src/controls/RadioButton.qml +++ b/src/controls/RadioButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index 38d580d2..8cf5b48a 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index 28f32765..7f7231ac 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index c82e3410..576a13c1 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index 82d196fa..ba082f8b 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 as Private diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml index 4c3e214c..cba976c8 100644 --- a/src/controls/StatusBar.qml +++ b/src/controls/StatusBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Tab.qml b/src/controls/Tab.qml index 91fa7ba9..b7d4fb7f 100644 --- a/src/controls/Tab.qml +++ b/src/controls/Tab.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 /*! \qmltype Tab diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml index d8e84889..c8e4b7a6 100644 --- a/src/controls/TabView.qml +++ b/src/controls/TabView.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles/Settings.js" as Settings diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index 696b41dc..ca5ecb59 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml index cf9e35ee..fe83561e 100644 --- a/src/controls/TableViewColumn.qml +++ b/src/controls/TableViewColumn.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 /*! \qmltype TableViewColumn diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 49e31bdb..85c0e056 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index f88320d1..8a9173a9 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles" @@ -377,7 +377,7 @@ Control { integers between 11 and 31 into the text input: \code - import QtQuick 2.0 + import QtQuick 2.1 import QtQuick.Controls 1.0 TextField { diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml index 8dea85e5..e9e993f9 100644 --- a/src/controls/ToolBar.qml +++ b/src/controls/ToolBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml index 613f925e..833ba127 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "Styles/Settings.js" as Settings diff --git a/src/experimental/Dial.qml b/src/experimental/Dial.qml index 2cbc15e1..fb649bf9 100644 --- a/src/experimental/Dial.qml +++ b/src/experimental/Dial.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/experimental/Dialog.qml b/src/experimental/Dialog.qml index dd71c2fc..9f913921 100644 --- a/src/experimental/Dialog.qml +++ b/src/experimental/Dialog.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Window 2.0 +import QtQuick 2.1 +import QtQuick.Window 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/private/AbstractCheckable.qml b/src/private/AbstractCheckable.qml index 08c410da..f0acf48f 100644 --- a/src/private/AbstractCheckable.qml +++ b/src/private/AbstractCheckable.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/private/BasicButton.qml b/src/private/BasicButton.qml index e1336b14..412028a0 100644 --- a/src/private/BasicButton.qml +++ b/src/private/BasicButton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/src/private/Control.qml b/src/private/Control.qml index ab0fe93a..e18e83f3 100644 --- a/src/private/Control.qml +++ b/src/private/Control.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 /*! diff --git a/src/private/FocusFrame.qml b/src/private/FocusFrame.qml index 34f27df3..08f4b04a 100644 --- a/src/private/FocusFrame.qml +++ b/src/private/FocusFrame.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/private/ModalPopupBehavior.qml b/src/private/ModalPopupBehavior.qml index 6fd4b5f2..1c6db2ff 100644 --- a/src/private/ModalPopupBehavior.qml +++ b/src/private/ModalPopupBehavior.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 // KNOWN ISSUES // none diff --git a/src/private/PageSlideTransition.qml b/src/private/PageSlideTransition.qml index 2e4b53a7..d77e1eaf 100644 --- a/src/private/PageSlideTransition.qml +++ b/src/private/PageSlideTransition.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/private/ScrollBar.qml b/src/private/ScrollBar.qml index 3d4a5d1f..4aaa2f76 100644 --- a/src/private/ScrollBar.qml +++ b/src/private/ScrollBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import "../Styles/Settings.js" as Settings diff --git a/src/private/ScrollViewHelper.qml b/src/private/ScrollViewHelper.qml index 1759edda..ec0194c2 100644 --- a/src/private/ScrollViewHelper.qml +++ b/src/private/ScrollViewHelper.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/private/TabBar.qml b/src/private/TabBar.qml index d0ae3795..a96ee100 100644 --- a/src/private/TabBar.qml +++ b/src/private/TabBar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/ButtonStyle.qml b/src/styles/ButtonStyle.qml index 2fb265c0..6cd165e6 100644 --- a/src/styles/ButtonStyle.qml +++ b/src/styles/ButtonStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/CheckBoxStyle.qml b/src/styles/CheckBoxStyle.qml index 011c8cdb..77b6c60d 100644 --- a/src/styles/CheckBoxStyle.qml +++ b/src/styles/CheckBoxStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/ComboBoxStyle.qml b/src/styles/ComboBoxStyle.qml index e9ca29ff..7a2da960 100644 --- a/src/styles/ComboBoxStyle.qml +++ b/src/styles/ComboBoxStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 /*! diff --git a/src/styles/Desktop/ButtonStyle.qml b/src/styles/Desktop/ButtonStyle.qml index 68022ae9..fb1e5204 100644 --- a/src/styles/Desktop/ButtonStyle.qml +++ b/src/styles/Desktop/ButtonStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/CheckBoxStyle.qml b/src/styles/Desktop/CheckBoxStyle.qml index a644e533..0388fffa 100644 --- a/src/styles/Desktop/CheckBoxStyle.qml +++ b/src/styles/Desktop/CheckBoxStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/ComboBoxStyle.qml b/src/styles/Desktop/ComboBoxStyle.qml index 368f7e87..fba1998c 100644 --- a/src/styles/Desktop/ComboBoxStyle.qml +++ b/src/styles/Desktop/ComboBoxStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/GroupBoxStyle.qml b/src/styles/Desktop/GroupBoxStyle.qml index 281daf98..ab49f8a3 100644 --- a/src/styles/Desktop/GroupBoxStyle.qml +++ b/src/styles/Desktop/GroupBoxStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/MenuBarStyle.qml b/src/styles/Desktop/MenuBarStyle.qml index 5abd1711..d0a6e16d 100644 --- a/src/styles/Desktop/MenuBarStyle.qml +++ b/src/styles/Desktop/MenuBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/MenuStyle.qml b/src/styles/Desktop/MenuStyle.qml index da93d12c..6de5c95a 100644 --- a/src/styles/Desktop/MenuStyle.qml +++ b/src/styles/Desktop/MenuStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/ProgressBarStyle.qml b/src/styles/Desktop/ProgressBarStyle.qml index b302755e..7d7cbc54 100644 --- a/src/styles/Desktop/ProgressBarStyle.qml +++ b/src/styles/Desktop/ProgressBarStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/RadioButtonStyle.qml b/src/styles/Desktop/RadioButtonStyle.qml index ff9f2b58..272e2e87 100644 --- a/src/styles/Desktop/RadioButtonStyle.qml +++ b/src/styles/Desktop/RadioButtonStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/ScrollBarStyle.qml b/src/styles/Desktop/ScrollBarStyle.qml index bd4fff4c..dc175f9a 100644 --- a/src/styles/Desktop/ScrollBarStyle.qml +++ b/src/styles/Desktop/ScrollBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/SliderStyle.qml b/src/styles/Desktop/SliderStyle.qml index 108dcef6..823e7746 100644 --- a/src/styles/Desktop/SliderStyle.qml +++ b/src/styles/Desktop/SliderStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/SpinBoxStyle.qml b/src/styles/Desktop/SpinBoxStyle.qml index 5b560a49..3405213b 100644 --- a/src/styles/Desktop/SpinBoxStyle.qml +++ b/src/styles/Desktop/SpinBoxStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/TabViewStyle.qml b/src/styles/Desktop/TabViewStyle.qml index 20ef36d1..1ec473d8 100644 --- a/src/styles/Desktop/TabViewStyle.qml +++ b/src/styles/Desktop/TabViewStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/src/styles/Desktop/TextFieldStyle.qml b/src/styles/Desktop/TextFieldStyle.qml index def6d06e..5024ca86 100644 --- a/src/styles/Desktop/TextFieldStyle.qml +++ b/src/styles/Desktop/TextFieldStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/ToolBarStyle.qml b/src/styles/Desktop/ToolBarStyle.qml index 9e44df42..52a4d09e 100644 --- a/src/styles/Desktop/ToolBarStyle.qml +++ b/src/styles/Desktop/ToolBarStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/Desktop/ToolButtonStyle.qml b/src/styles/Desktop/ToolButtonStyle.qml index 3dbabc17..af3da43c 100644 --- a/src/styles/Desktop/ToolButtonStyle.qml +++ b/src/styles/Desktop/ToolButtonStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/GroupBoxStyle.qml b/src/styles/GroupBoxStyle.qml index 27a7995a..2edd0504 100644 --- a/src/styles/GroupBoxStyle.qml +++ b/src/styles/GroupBoxStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/MenuBarStyle.qml b/src/styles/MenuBarStyle.qml index 3d31db99..6b7950eb 100644 --- a/src/styles/MenuBarStyle.qml +++ b/src/styles/MenuBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 /*! diff --git a/src/styles/MenuStyle.qml b/src/styles/MenuStyle.qml index df48964b..d80ba9e6 100644 --- a/src/styles/MenuStyle.qml +++ b/src/styles/MenuStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/src/styles/ProgressBarStyle.qml b/src/styles/ProgressBarStyle.qml index 75fc9f52..799cb676 100644 --- a/src/styles/ProgressBarStyle.qml +++ b/src/styles/ProgressBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/RadioButtonStyle.qml b/src/styles/RadioButtonStyle.qml index a5157efe..764e306f 100644 --- a/src/styles/RadioButtonStyle.qml +++ b/src/styles/RadioButtonStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/ScrollBarStyle.qml b/src/styles/ScrollBarStyle.qml index 65ff068b..4fed597d 100644 --- a/src/styles/ScrollBarStyle.qml +++ b/src/styles/ScrollBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/SliderStyle.qml b/src/styles/SliderStyle.qml index 7fb03742..2f618a17 100644 --- a/src/styles/SliderStyle.qml +++ b/src/styles/SliderStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/src/styles/SpinBoxStyle.qml b/src/styles/SpinBoxStyle.qml index 4d627b28..890e7344 100644 --- a/src/styles/SpinBoxStyle.qml +++ b/src/styles/SpinBoxStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/Style.qml b/src/styles/Style.qml index 977f6198..6cb65380 100644 --- a/src/styles/Style.qml +++ b/src/styles/Style.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 /*! diff --git a/src/styles/TabViewStyle.qml b/src/styles/TabViewStyle.qml index bcc8d4fa..9f4c0bd9 100644 --- a/src/styles/TabViewStyle.qml +++ b/src/styles/TabViewStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Styles 1.0 /*! diff --git a/src/styles/TextFieldStyle.qml b/src/styles/TextFieldStyle.qml index 644b853b..c2467ee8 100644 --- a/src/styles/TextFieldStyle.qml +++ b/src/styles/TextFieldStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/ToolBarStyle.qml b/src/styles/ToolBarStyle.qml index ec1612c5..450304ed 100644 --- a/src/styles/ToolBarStyle.qml +++ b/src/styles/ToolBarStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/src/styles/ToolButtonStyle.qml b/src/styles/ToolButtonStyle.qml index 2d63e116..13b9813c 100644 --- a/src/styles/ToolButtonStyle.qml +++ b/src/styles/ToolButtonStyle.qml @@ -37,7 +37,7 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 /*! diff --git a/tests/auto/controls/data/rangemodel/rangemodel.qml b/tests/auto/controls/data/rangemodel/rangemodel.qml index d665fd9b..bf03dd0c 100644 --- a/tests/auto/controls/data/rangemodel/rangemodel.qml +++ b/tests/auto/controls/data/rangemodel/rangemodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls.Private 1.0 RangeModel { diff --git a/tests/auto/controls/data/shortcut/shortcuts.qml b/tests/auto/controls/data/shortcut/shortcuts.qml index dcccaa6f..c9c6f5f5 100644 --- a/tests/auto/controls/data/shortcut/shortcuts.qml +++ b/tests/auto/controls/data/shortcut/shortcuts.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 Rectangle { diff --git a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml index 36aa37b2..4b26f66d 100644 --- a/tests/auto/controls/data/tableview/table1_qobjectmodel.qml +++ b/tests/auto/controls/data/tableview/table1_qobjectmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml index d69d21ad..bc3da232 100644 --- a/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml +++ b/tests/auto/controls/data/tableview/table2_qabstractitemmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tableview/table3_qobjectlist.qml b/tests/auto/controls/data/tableview/table3_qobjectlist.qml index b39d084f..f3f64327 100644 --- a/tests/auto/controls/data/tableview/table3_qobjectlist.qml +++ b/tests/auto/controls/data/tableview/table3_qobjectlist.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tableview/table4_qstringlist.qml b/tests/auto/controls/data/tableview/table4_qstringlist.qml index a36f52c2..75840499 100644 --- a/tests/auto/controls/data/tableview/table4_qstringlist.qml +++ b/tests/auto/controls/data/tableview/table4_qstringlist.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tableview/table5_listmodel.qml b/tests/auto/controls/data/tableview/table5_listmodel.qml index b3348e45..c0e46abc 100644 --- a/tests/auto/controls/data/tableview/table5_listmodel.qml +++ b/tests/auto/controls/data/tableview/table5_listmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table6_countmodel.qml b/tests/auto/controls/data/tableview/table6_countmodel.qml index a5084944..995de485 100644 --- a/tests/auto/controls/data/tableview/table6_countmodel.qml +++ b/tests/auto/controls/data/tableview/table6_countmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table7_arraymodel.qml b/tests/auto/controls/data/tableview/table7_arraymodel.qml index 7e427a53..d3483ddc 100644 --- a/tests/auto/controls/data/tableview/table7_arraymodel.qml +++ b/tests/auto/controls/data/tableview/table7_arraymodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 TableView { diff --git a/tests/auto/controls/data/tableview/table8_itemmodel.qml b/tests/auto/controls/data/tableview/table8_itemmodel.qml index bfbc5e9a..081f1d61 100644 --- a/tests/auto/controls/data/tableview/table8_itemmodel.qml +++ b/tests/auto/controls/data/tableview/table8_itemmodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 TableView { diff --git a/tests/auto/controls/data/tst_applicationwindow.qml b/tests/auto/controls/data/tst_applicationwindow.qml index 0681f9f1..e465d47d 100644 --- a/tests/auto/controls/data/tst_applicationwindow.qml +++ b/tests/auto/controls/data/tst_applicationwindow.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index 7138deed..1efbd4e9 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { @@ -70,7 +70,7 @@ TestCase { function test_action() { var test_actionStr = - 'import QtQuick 2.0; \ + 'import QtQuick 2.1; \ import QtQuick.Controls 1.0; \ Item { \ property var testAction: Action { \ diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index ee386523..ae996d01 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 Item { @@ -165,7 +165,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.0; \n" + var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.0; \n" + "Row { \n" + " property alias checkBox1: checkBox1 \n" + " property alias checkBox2: checkBox2 \n" diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml index 9c7ab772..3a0f0568 100644 --- a/tests/auto/controls/data/tst_combobox.qml +++ b/tests/auto/controls/data/tst_combobox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { @@ -50,7 +50,7 @@ TestCase { property var model function init() { - model = Qt.createQmlObject("import QtQuick 2.0; ListModel {}", testCase, '') + model = Qt.createQmlObject("import QtQuick 2.1; ListModel {}", testCase, '') model.append({ text: "Banana", color: "Yellow" }) model.append({ text: "Apple", color: "Green" }) model.append({ text: "Coconut", color: "Brown" }) diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index e47f77c1..2f2591f8 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_menu.qml b/tests/auto/controls/data/tst_menu.qml index 8d039e1d..7d621912 100644 --- a/tests/auto/controls/data/tst_menu.qml +++ b/tests/auto/controls/data/tst_menu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 import QtQuick.Controls 1.0 diff --git a/tests/auto/controls/data/tst_menubar.qml b/tests/auto/controls/data/tst_menubar.qml index edf92b3b..80699d33 100644 --- a/tests/auto/controls/data/tst_menubar.qml +++ b/tests/auto/controls/data/tst_menubar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_page.qml b/tests/auto/controls/data/tst_page.qml index c43f809e..acb0f627 100644 --- a/tests/auto/controls/data/tst_page.qml +++ b/tests/auto/controls/data/tst_page.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_pagestack.qml b/tests/auto/controls/data/tst_pagestack.qml index bad1683b..e5c56dbd 100644 --- a/tests/auto/controls/data/tst_pagestack.qml +++ b/tests/auto/controls/data/tst_pagestack.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 import QtQuick.Controls 1.0 diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index 4798d863..b68a592a 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index bf076ea5..c2e6bffd 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 Item { @@ -135,7 +135,7 @@ Item { } function test_exclusiveGroup() { - var root = Qt.createQmlObject("import QtQuick 2.0; import QtQuick.Controls 1.0; \n" + var root = Qt.createQmlObject("import QtQuick 2.1; import QtQuick.Controls 1.0; \n" + "Row { \n" + " property alias radioButton1: radioButton1 \n" + " property alias radioButton2: radioButton2 \n" diff --git a/tests/auto/controls/data/tst_rangemodel.qml b/tests/auto/controls/data/tst_rangemodel.qml index dd3ac338..52697140 100644 --- a/tests/auto/controls/data/tst_rangemodel.qml +++ b/tests/auto/controls/data/tst_rangemodel.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_rowlayout.qml b/tests/auto/controls/data/tst_rowlayout.qml index 539c8e5b..e444dd95 100644 --- a/tests/auto/controls/data/tst_rowlayout.qml +++ b/tests/auto/controls/data/tst_rowlayout.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 Item { @@ -54,7 +54,7 @@ Item { function test_fixedAndExpanding() { var test_layoutStr = - 'import QtQuick 2.0; \ + 'import QtQuick 2.1; \ import QtQuick.Layouts 1.0; \ RowLayout { \ id: row; \ @@ -91,7 +91,7 @@ Item { function test_allExpanding() { var test_layoutStr = - 'import QtQuick 2.0; \ + 'import QtQuick 2.1; \ import QtQuick.Layouts 1.0; \ RowLayout { \ id: row; \ diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml index 05519f6e..ee66939e 100644 --- a/tests/auto/controls/data/tst_scrollview.qml +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 import QtQuick.Controls 1.0 diff --git a/tests/auto/controls/data/tst_shortcuts.qml b/tests/auto/controls/data/tst_shortcuts.qml index db1c46db..30c234a0 100644 --- a/tests/auto/controls/data/tst_shortcuts.qml +++ b/tests/auto/controls/data/tst_shortcuts.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 import QtQuick.Controls 1.0 import QtQuick.Controls.Private 1.0 diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 1cb65c67..305b0f57 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml index b725b88a..5994b451 100644 --- a/tests/auto/controls/data/tst_spinbox.qml +++ b/tests/auto/controls/data/tst_spinbox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 Item { diff --git a/tests/auto/controls/data/tst_splitview.qml b/tests/auto/controls/data/tst_splitview.qml index cf4eb6c2..fee25f3e 100644 --- a/tests/auto/controls/data/tst_splitview.qml +++ b/tests/auto/controls/data/tst_splitview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 import QtQuick.Controls 1.0 diff --git a/tests/auto/controls/data/tst_statusbar.qml b/tests/auto/controls/data/tst_statusbar.qml index 1761a613..f85195bd 100644 --- a/tests/auto/controls/data/tst_statusbar.qml +++ b/tests/auto/controls/data/tst_statusbar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_tab.qml b/tests/auto/controls/data/tst_tab.qml index 9c495153..d839ff41 100644 --- a/tests/auto/controls/data/tst_tab.qml +++ b/tests/auto/controls/data/tst_tab.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_tableview.qml b/tests/auto/controls/data/tst_tableview.qml index f5c220c2..475d2dd9 100644 --- a/tests/auto/controls/data/tst_tableview.qml +++ b/tests/auto/controls/data/tst_tableview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 import QtQuick.Controls 1.0 import QtQuickControlsTests 1.0 diff --git a/tests/auto/controls/data/tst_tableviewcolumn.qml b/tests/auto/controls/data/tst_tableviewcolumn.qml index 5bea2bb9..37468af4 100644 --- a/tests/auto/controls/data/tst_tableviewcolumn.qml +++ b/tests/auto/controls/data/tst_tableviewcolumn.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_tabview.qml b/tests/auto/controls/data/tst_tabview.qml index 0c9d0057..7bf9a00f 100644 --- a/tests/auto/controls/data/tst_tabview.qml +++ b/tests/auto/controls/data/tst_tabview.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { @@ -53,7 +53,7 @@ TestCase { } function test_repeater() { - var tabView = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { } } }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { } } }', testCase, ''); compare(tabView.count, 3) } @@ -63,7 +63,7 @@ TestCase { } function test_changeIndex() { - var tabView = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { Repeater { model: 3; Tab { Text { text: index } } } }', testCase, ''); compare(tabView.count, 3) verify(tabView.tabAt(1).item == undefined) tabView.currentIndex = 1 @@ -75,7 +75,7 @@ TestCase { function test_addRemoveTab() { - var tabView = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TabView { }', testCase, ''); + var tabView = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TabView { }', testCase, ''); compare(tabView.count, 0) tabView.addTab("title 1", newTab) compare(tabView.count, 1) diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index a74d8a63..27f68a1a 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index d4f39f3a..e9bd4541 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { @@ -122,7 +122,7 @@ TestCase { } function test_validator() { - var textfield = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') + var textfield = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; TextField {validator: RegExpValidator { regExp: /(red|blue|green)?/; }}', testCase, '') textfield.text = "blu" compare(textfield.acceptableInput, false) diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index 83e3927a..68765b0d 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index 14613e9d..e488d03b 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 TestCase { diff --git a/tests/auto/qtdesktop/data/tst_groupbox.qml b/tests/auto/qtdesktop/data/tst_groupbox.qml index 8b4de71b..f5ddf4c9 100644 --- a/tests/auto/qtdesktop/data/tst_groupbox.qml +++ b/tests/auto/qtdesktop/data/tst_groupbox.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtTest 1.0 import QtDesktop 1.0 diff --git a/tests/manual/ContextMenu.qml b/tests/manual/ContextMenu.qml index dfbab938..6310ef7d 100644 --- a/tests/manual/ContextMenu.qml +++ b/tests/manual/ContextMenu.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 diff --git a/tests/manual/Dialog.qml b/tests/manual/Dialog.qml index 47f4d7b4..00f9aeed 100644 --- a/tests/manual/Dialog.qml +++ b/tests/manual/Dialog.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 Rectangle { diff --git a/tests/manual/Layout.qml b/tests/manual/Layout.qml index d23aaa21..19374f62 100644 --- a/tests/manual/Layout.qml +++ b/tests/manual/Layout.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 diff --git a/tests/manual/PageStack.qml b/tests/manual/PageStack.qml index 5c5491d6..0b3713af 100644 --- a/tests/manual/PageStack.qml +++ b/tests/manual/PageStack.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import QtQuick 2.0 -import QtQuick.Window 2.0 +import QtQuick 2.1 +import QtQuick.Window 2.1 import QtQuick.Controls 1.0 Window { diff --git a/tests/manual/WindowContextMenu.qml b/tests/manual/WindowContextMenu.qml index 573c9c4f..9989ae03 100644 --- a/tests/manual/WindowContextMenu.qml +++ b/tests/manual/WindowContextMenu.qml @@ -38,9 +38,9 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 -import QtQuick.Window 2.0 +import QtQuick.Window 2.1 Window { width: 540 diff --git a/tests/manual/keynavigation.qml b/tests/manual/keynavigation.qml index 515c6e01..55ddb478 100644 --- a/tests/manual/keynavigation.qml +++ b/tests/manual/keynavigation.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 0.1 ApplicationWindow { diff --git a/tests/manual/scrollview/main.qml b/tests/manual/scrollview/main.qml index 8c077af8..cb26763f 100644 --- a/tests/manual/scrollview/main.qml +++ b/tests/manual/scrollview/main.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 diff --git a/tests/manual/splitter.qml b/tests/manual/splitter.qml index 104c92e6..e4b08e70 100644 --- a/tests/manual/splitter.qml +++ b/tests/manual/splitter.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 ApplicationWindow { diff --git a/tests/manual/stretching.qml b/tests/manual/stretching.qml index 9af4ca1d..a8d86eb3 100644 --- a/tests/manual/stretching.qml +++ b/tests/manual/stretching.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/tests/manual/stretchingcustom.qml b/tests/manual/stretchingcustom.qml index 8df1f794..fa56757f 100644 --- a/tests/manual/stretchingcustom.qml +++ b/tests/manual/stretchingcustom.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/tests/manual/tableviewmodels/qml/main.qml b/tests/manual/tableviewmodels/qml/main.qml index e99165f3..f9da0f68 100644 --- a/tests/manual/tableviewmodels/qml/main.qml +++ b/tests/manual/tableviewmodels/qml/main.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 Rectangle { diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml index 8a3195b3..8eca5e75 100644 --- a/tests/manual/testbench/content/Components.qml +++ b/tests/manual/testbench/content/Components.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 Item { diff --git a/tests/manual/testbench/content/PropertyLayouts.qml b/tests/manual/testbench/content/PropertyLayouts.qml index 88d64acf..3a870e85 100644 --- a/tests/manual/testbench/content/PropertyLayouts.qml +++ b/tests/manual/testbench/content/PropertyLayouts.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index a5f5f693..ae0a07c6 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ -import QtQuick 2.0 +import QtQuick 2.1 import QtQuick.Controls 1.0 import QtQuick.Layouts 1.0 import "content" @@ -230,7 +230,7 @@ ApplicationWindow { case "HorizontalAlignment": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.AlignLeft", value: TextEdit.AlignLeft}); enumModelData.append({ text: "TextEdit.AlignRight", value: TextEdit.AlignRight}); @@ -239,7 +239,7 @@ ApplicationWindow { case "VerticalAlignment": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextEdit.AlignTop", value: TextEdit.AlignTop}); enumModelData.append({ text: "TextEdit.AlignBottom", value: TextEdit.AlignBottom}); @@ -248,7 +248,7 @@ ApplicationWindow { case "InputMethodHints": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.ImhNone", value: Qt.ImhNone}); enumModelData.append({ text: "Qt.ImhHiddenText", value: Qt.ImhHiddenText}); @@ -271,7 +271,7 @@ ApplicationWindow { case "Orientation": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Qt.Horizontal", value: Qt.Horizontal}); enumModelData.append({ text: "Qt.Vertical", value: Qt.Vertical}); @@ -279,7 +279,7 @@ ApplicationWindow { case "EchoMode": layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "TextInput.Normal", value: TextInput.Normal}); enumModelData.append({ text: "TextInput.Password", value: TextInput.Password}); @@ -291,7 +291,7 @@ ApplicationWindow { case "TextColor": isColor = true layout = layouts.enumLayout - enumModelData = Qt.createQmlObject('import QtQuick 2.0; import QtQuick.Controls 1.0; ListModel {}', layout, ''); + enumModelData = Qt.createQmlObject('import QtQuick 2.1; import QtQuick.Controls 1.0; ListModel {}', layout, ''); typeName = "Enum"; enumModelData.append({ text: "Amber", value: "#FF7E00"}); enumModelData.append({ text: "Azure", value: "#007FFF"}); |