diff --git a/examples/gallery/content/ChildWindow.qml b/examples/gallery/content/ChildWindow.qml index 74b0595646282691de01f201b39dd8d4f3f50a73..c4094209ffc14e4d34f02c9d388f0dd481e30469 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 0a2c74ab278c2214c45d211de77c77e75c6584ef..ff4c370a9a3f9f4364243c0c1f765ebfbe2602b2 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 cd731ca9f0b5a63080eb7e26b9a0826fc64fa473..81bd9f7b94bdfbffceaf405ee641454b037790c1 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 60905fd7f6a2058707fb4bc42982bd93b3ffc687..9cfc7250f5411814e7ea3ecebe824e29e197926a 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 2950ef179d42afe4a93f59b19461839a9eb2ebf9..8aeb03451ec15479dd6c81e78a8c58c510095777 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 1db9422303965ed656c702c847b5667c152a9872..911cbe1d83c5883ee60c0867d0da4a81dd03f6a0 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 0d35ae71f70a435d6446ace651c1d0de2081bae8..1df39a82374271b335afda2f0be145ac2fab0356 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 8624120cb2269397343c62e0d6d6a9801eb263fd..e1d38d405fb37c8cda9bbea05e9f331de1d3e92c 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 c51fe07a43c54d5d66c1b50ed9eba0025af9832a..36a439a8e0ea20756630d1bd922ebc16bd3f73ea 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 dbe77836c8ba9f9472d49cd0086d2a18b7b8f5b9..ff86c81406e7abe5d1ae7f7471175367a398bd37 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 d5b1a5904fa2b6d785b678209ffb3da97e5318b7..abbf78fc786441b7bee94cd65d621dd7b937a85f 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 2651837f48a8fb4a54a38e98f5287adde2c30de9..d90a3c2cd69108c25292f2af30baf9e98b83bc39 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 4edbaabde1f1c5c50f7ef302298c2d48759cb4a7..0a47308b6e0ecd8170cb07915a70d4b2883d747e 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 fd84d05e4787d2e0ec785520fd25924b15006a7e..e363648b845590113c019e1a3a928eee4ef04a81 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 05ad18f82d45674a40ae83e93a67f1cfccfb9ff5..3ce116f366c55b319c8eccc08c641510ee7c194a 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 03eb8acbc7a4d974dff58ffd0da873bee95b1e5c..48d5ffeb03911e6f8349fe7772a4366760a57e8d 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 57b5b3557b8a09c355c4d09913944de7b7f08fe4..5317e6147ce823651b1d9f53774c3cb782fc8962 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 542d0f3ed7da2f4c78a9e3aa90c9aeebb757b2a7..c459e812be1df0f7348a30867a8b558084b7f085 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 e76e1f5aff4fcc466cbe5b3de7a413f76f56daa6..14dca758a699b00a39f9fec04691b8f38f25cac9 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 e7cf4864e0a220d5add2abe5ec6f5bc2347ab9e2..0571d1fb7001e0e0c86765bcdb4307edb7ac4f1f 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 460e77cec43ee3b2c00bee632812fdd6c96921f1..e983ecc795f6f4069293484013ff4fa39ef8af23 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 8641a0e14c151f835bcf559478d8f529a6e8d715..ddbef1ae9b06e3e751f44c509717162b1463d08f 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 9abe5cead9faf01ab03c6ae6f21e0eb30b0be427..e03ae4870eca55b8348f397c53049de81c2fe77e 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 7ab9194cf43832bcb14aaa94fc868cc8a2371756..4295f65c00850669d7d186486c8a31ecf718a5e6 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 0481e5f88166e47ee3e8abd2491ee18cc36be5de..2e9c3f0f7db39e24c883d842e254ea56bd0d10c8 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 c40f22ea5c4fc9a8da4f9f3ccbaad32fa4ffc6ad..89cf0170c03d0b6bebd5ac0bdef0bbe866d4bae8 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 6f827f907aeb994c1cbb0a71ffc32784188ec88d..bb212b0c7fe295a92316f27c894da053cc9a61f1 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 1f4e6bf3ab7443eac8d0ca773d629f9b61160b39..e49ae8be839f9ca8b6b04f9f26254f5525374bdd 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 47eab5ee3df48f448a59c65610bb185d56dfced5..bfb37a60634055dbc7fc310f1074ac3417def3be 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 38d580d29cce2f77f34ed04652d710b7876d66cb..8cf5b48ae77277e2800d134cb5d4194f32f7c066 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 28f32765a9da1c857636dd4a54c8fe6cccbb7b10..7f7231acf8fc07d1c8df4226aadf26c6d95fed3a 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 c82e3410f7201b7c2210d2770b205dd3f78d991d..576a13c10bd7e0545312db43fd2a1b7abebfb523 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 82d196faa1980d771fb6a2d32037f19ebbd80e2c..ba082f8bd6c759e5eb7d1341ec1869e1fa7d61f0 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 4c3e214cbed679088340a7bbe87e74e00d5fc5b0..cba976c8b272eb90da86a64c56f8c336ca655653 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 91fa7ba908c08a77c1c7c7af509aa88bb6a2c50b..b7d4fb7f5f934dd9c40c956a65bbebf33da6ae38 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 d8e8488908e969305353e8ef995e31be632c28d2..c8e4b7a64f1e1a70dc6a176745bb7698c94a8cb7 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 696b41dc03f693c63003e94a3a595d6adb76ebe0..ca5ecb592593516953f16fc2f25f30e6a8cb8a93 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 cf9e35ee86e884376c07dc4dfc756359c8962152..fe83561eee1ba0476d3265667eeb2da9f9156d13 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 49e31bdbc55d1f7538df1c87ce50cb34755ef76e..85c0e056a5d4af393ded3caa2e1a8ac3aa074eb2 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 f88320d1c226202d3e76f5b976e924ee41edaa28..8a9173a93bb03797cc5c9523750e98377aed23d9 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 8dea85e5dd89cc1fd05a53fe417abdc4c93d9892..e9e993f965db8d31b4db4c6e333f74fdca9c2120 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 613f925e65173c7fcb0885748d50178190632640..833ba12737a3f37f0a112d130c0b8c2b7c3163da 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 2cbc15e1bb1c18d0fb4f2220783e3da7878a2dcf..fb649bf9a1ea4f70fb268b109055a5adcd213ad3 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 dd71c2fc5e0aabf61281227f6c97fd404d134100..9f913921750dc5ad0c7857bfb7c4553d61b9ae44 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 08c410da7d568fc9eec5fd6628172c3c78d09fd2..f0acf48fb1fff72b49e776f821e401adb9ee10ba 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 e1336b14c906c2e2d1f484e9c646a9da885c3759..412028a08c7e28115bc03252da367e243304fcd1 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 ab0fe93a1b977e3a0977a34903fc803e4a6d3a3d..e18e83f308fbfeb274988fe8e216e060bd46348d 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 34f27df3db3b761caf6899e75b4a58b0245be499..08f4b04a7323ba99065afdd63baed4f4aba07855 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 6fd4b5f29a1180fb14c2f25bf30b9f3bb0971259..1c6db2ff18b88b1660bc4ac9ad2d7a9d3dd70fe5 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 2e4b53a7709dc02e721bbdc812164037bf17cb9a..d77e1eaf8bd9cfe2ef5b85265df71ce208acc252 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 3d4a5d1f9e27a39f82d9728a338014fa4fef7ef3..4aaa2f7661b02a96a55b94b85b5e5aaaa2a43021 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 1759edda7583451d65e09832dd82b683b72ead66..ec0194c2d3aed6efe2062b39fd94a975c7c74594 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 d0ae3795548f32f92d09a36d6c0303bccf7693b5..a96ee10056798814e4058cc9629195fe1a503a71 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 2fb265c07c29f6750928017e6ec97df56fc6f38f..6cd165e6b26429752ab162141428d6da28c8c266 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 011c8cdb32e6924fbf70af60bb86481f4c3e9e77..77b6c60dc1c7f01a220c9a13b32805db6e9a89f6 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 e9ca29ffb9caf3640fa0bbcd13b0be4e80549584..7a2da96073e23fcd8a52febd5b5e39b90dfa334d 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 68022ae9728296c14e0761068416211e89fdd514..fb1e52043b0984d23e139f89ca2c3a94d6d0b718 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 a644e533dff39dbaf447e6632a973465d507abce..0388fffaf8763a2491cdc38d09287f52a9c11a62 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 368f7e87568d8d10a2c98b125294fe47bff15d97..fba1998c58af11742b4b235fb912276d4bab9069 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 281daf984b9823d7c3ac1d918a8d8b0f05f9fa9c..ab49f8a321a6191f1855a92d9dc3cf9418ef1eab 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 5abd171127d08963e9efc97c37dae34de96eff51..d0a6e16dfe4a3fc7da007415e3f2b2628ef149b3 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 da93d12c2c0d828cbb1e0f56667c9e4cc1552481..6de5c95a52b5d559343b5fba25a748cc06cb5f33 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 b302755ed3be3c7f8605959a3f8763781bccfee8..7d7cbc5445c6fdcf48df4479cc6dbddeabc75fce 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 ff9f2b582f0968960b1ed4b7d58fc8a7d863c5b4..272e2e878ccd35e92647f46e187a889ca4aec214 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 bd4fff4c2998f80004f240adf590204ab1eef55d..dc175f9aacb847cbe7389fad57edb53dd2e9fc58 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 108dcef6301f7ecd35b24bfbd2597b3760c22575..823e77464b16fefad5d466136c6d9b370b4e70ac 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 5b560a49ad29094b9577d9075f85a7b427443ee4..3405213b5be4566af5cbfdf9d47de20ada45f8d0 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 20ef36d12275692d5fbbd7fbfb725183a3984f04..1ec473d8164c42e9e6742761c09dc4014a0a51f8 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 def6d06ea6265af36747a9fce1d46abe1890cdaf..5024ca861c04112579b58d56c2169d6cdf1ffe82 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 9e44df4258a4b2a1f20d83dd38713dc8a3954928..52a4d09e82d8d92d40859581fd08b16b3c3faa75 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 3dbabc17d8638a663df8c311eee75565fa6bc72b..af3da43c004c872e97f872df0caab3269a6d8e0f 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 27a7995af2130c2b4e3067b92d4a5dfa45f4fe36..2edd05041e1eb8a4dc7aa4b833ba694b36779a30 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 3d31db99ba94636c4000cdcd3c8c60f20bb1b91d..6b7950ebfdd6c7ec6393295ef67cd72b4a7367d6 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 df48964bf86b5b3e01296b4a4940090caa2987d7..d80ba9e6e8be969019e7ad1d23713a8ae35f865c 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 75fc9f520b74c11674193a33d2912abc4950b9d9..799cb67641e1b2ee2f8435223fd3f978df3472c7 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 a5157efe79190bc85f974469f8c3b485947b3c1a..764e306f805d21df99eb19fdc227845455d9a117 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 65ff068b536e0cd3dbac7703645d4205448028f1..4fed597d22e47d3ab6dd048a009d756d10d6b579 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 7fb03742f9a2551ebdfcfc916746fdc6447f9646..2f618a1791c4414a548dd6eb8aef270f1e09d978 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 4d627b2894c2e46db2588d9ddff96946263cb219..890e734455ec4d4023e6e595c428e8f97bccd819 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 977f61986c842ce39f5fa5de32a6b5b8dbec9611..6cb653803871a81253c85d40cfa81e8ceb82f2e0 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 bcc8d4faa6f09761839c65922200f36421a0b33d..9f4c0bd995c7cc25886e31378702fbe23a7259f2 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 644b853bc39b997f1124c7282fb9cac90a3f5a0f..c2467ee8ffc7b139921ad6312be01e3fade67713 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 ec1612c59042841822bf97cfe7543717b1876640..450304ed093b88c3a3d40d759f27f69d78aa03a9 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 2d63e116ccce08960fb213e6e50c0c42e8602d29..13b9813c7346ea67ccdc7d7a07e188f9445ba2df 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 d665fd9b35f29ee96d16fbde72fae6b1a030a7e9..bf03dd0c67c4d648529792b77713109943ee0bd3 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 dcccaa6fbb3d5382fad9ac203a65f0df03f318bf..c9c6f5f57e39e16c5d20c92effaa6e8cb46d7a97 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 36aa37b2e9c3d1f2f0f8ba6ed3fe55adeb8db2c1..4b26f66ddd24c272cac98705e38c4afea080dec7 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 d69d21ad83f0012d3300b118cc50b582bd76d0c1..bc3da2328c37dfaaa680fda6ec2e75f6acc07756 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 b39d084fdb3d1832987bce1966430610bcb77aff..f3f64327ed6706d3888a38aeb8b5a4aedfb0f8d3 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 a36f52c299928aaa30f634c736091d91976c3e14..75840499a1669e0790506e90256426eb41aa95a8 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 b3348e457ceb0f130316c71b4e42b90feb2e25ec..c0e46abcbbe509ae59678e2e5f3a031cf508b953 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 a5084944da66d85829b3928da8dc9c5df30e6d60..995de48527868f1b34ec95176fbddd71c7c13938 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 7e427a5341d3fabedd9caa39967cefdbbe36b182..d3483ddcb1b262eb3ef0e57ab12e513aee09bf44 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 bfbc5e9a630599f931636640575a7d72fed4e25e..081f1d61b13e16f184ee82f85f09d7caef6b2e88 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 0681f9f170075f63d0d8669ccc83fe63db4198f5..e465d47d08acb5c669cf5b2f289a2a49d17bdb5d 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 7138deed1dbc7bfd2583562a4866d5d12e66f02e..1efbd4e9d432a08d5cff3838489ba71c2f0d65ef 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 ee38652386b7f02a45b37aeb2950479f4a821eec..ae996d01ec4236f73ee61fe718417232b26cfbc9 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 9c7ab77229f045afcef89e223120a3c3ae1e3d0f..3a0f05688014cb536ed570b5d38bc549e4388304 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 e47f77c1a1c663491c121cdacec88cdadd379bfe..2f2591f8527a8848b00b185634fcd5d9bd38750a 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 8d039e1dc70c676d8013060f5eb9ebb7ba12da9e..7d62191237d755041dbf8aa2ac873a5f2f19cb75 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 edf92b3bf0200d0c283d9e367049581b75b74e50..80699d336284d005ac754f35b6b7751f7b8fc238 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 c43f809eb0ef667ffe1bb1e9342e70901aa5e547..acb0f627bad2cbaae6d338772308a0435eec26ee 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 bad1683b14f20c5853757c2d8f302fa071d54ec0..e5c56dbdbacda0c86dd53557e287989ba1d30c25 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 4798d863a6285577294b3bf2d3543b3dd38ac4b9..b68a592a633904b57632b868d7b908631d05b75a 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 bf076ea559b4f6a3624a49a0b6ffa33f1f44af87..c2e6bffd2c751ae8e2c94a270602c4211730a4be 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 dd3ac3380bc389b00c17b10876d1dd9601ca76ba..526971400d3cdbd096c6c4bbf24a22a38f8f8276 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 539c8e5ba003b608c0fa659e44904f06b064e55d..e444dd950bb46ec3e465aa3a0ddb41d82982fc4e 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 05519f6ed7894ee856d560c9547b3f9d183b5323..ee66939e8af77d1116e50447387745d5092887bf 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 db1c46dbb5dbd330e51732656c656b5c97f4f9a0..30c234a0b7ad0d592b839824bdfe89755fdc7dee 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 1cb65c672595c435b2e757233402ed656952cbbe..305b0f57f99074192897ea6da59e4abb8de63fbf 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 b725b88a0e08ce1dbd6e3f12b0f9b17962bd56f6..5994b451e1c3f0bae5c552fcf87123785009e8ee 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 cf4eb6c29243f3ad59e29ae1f6f854e9f5794ff3..fee25f3e03fe858c368eafcb175eba48f304f1b0 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 1761a613fdcd537af4cc67a4cc510e83dc836124..f85195bd9484acadf17538aec66c320fbbd269eb 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 9c49515339639d974e0de62abc6c34132fbcb944..d839ff41b24cb185d769674abd4ac7de49821ad9 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 f5c220c277ae6e0283b86575bc25bf990f1e8c33..475d2dd9fb043b0525e9a7505fc6d18285d9a175 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 5bea2bb9fd579b3087bf98bae12aad71d0cb8909..37468af48266c83f79ffff0d651be05d49466689 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 0c9d0057c0191f39cfac130c59a321a9b2b3ba16..7bf9a00ff9b5e63425bbab706c21bccb1a3dc584 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 a74d8a63f00975603ebd3428f82b3f6ae6ac866f..27f68a1a2ee1827f691ab01a3b13826b0198feaf 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 d4f39f3a516e2a1a541c863589a000f152be1e9e..e9bd45410b308e977a8fe6c013604dd03f5bf48d 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 83e3927afb5003b3c877d3f88bb9f3ab3fcd328d..68765b0d3cc3a8509293d44178b925597636fd17 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 14613e9d84607622c8f04d9cf8e9555536f36fec..e488d03b3de8a3303685e2bf2a06b5712303d10d 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 8b4de71b604434fb5fe2595b2b8c390b60362950..f5ddf4c9990ec67e523859e8de2e2838ae928560 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 dfbab938a5629733f44cb3a8b618bd8c9eba5e03..6310ef7de67529bc35c3310e4f3827e614c937a2 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 47f4d7b4a0008aa7f93e224d242bf5199ad4834a..00f9aeedd7fab92905291f28dde4239a4d6b06d2 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 d23aaa21ba17f7bc4856de0c81e7779e7a0ce346..19374f62d3eeeb688790b3815b6d76ac674ac6e7 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 5c5491d6397f431f94a1eea99191a392a28b08b6..0b3713af3537684faba4af261492a956c234a6d6 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 573c9c4f26757f1b2499699245c7e3648e06d39d..9989ae03ed7e8bb42c67f38d5127d37bae2493f5 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 515c6e0186ddc18a47207d1076c5bbc6effd7c93..55ddb4786b18841e066ff05d40c77636de3ee1d5 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 8c077af8bf83cbcaf5b7114540cd205e9ee4ca5d..cb26763f32cd8c455fd9311c3dc945891b2d76c8 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 104c92e60a552ef5e88d5efab1dfd6827006c0e2..e4b08e700972e92208b121f5f6ae47c01af0424a 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 9af4ca1d6b88e43361fbf749c8e44ca96b114352..a8d86eb39ad038c6c48e653353cb0f19c908263d 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 8df1f794fd28798b42979ee79625b1638d04dec5..fa56757f293cada0f62f241971ba18deb4d7c906 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 e99165f35540289dae2ad1d29dfc3ad26667f9df..f9da0f6807ac6bad8826d9ba625e34a576aa18e6 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 8a3195b31c04d2ec980f9d2a62fd59a92d03902b..8eca5e7512208d40bf88a7619e13a19c629e56cb 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 88d64acf4a8a103b6dc5dd5efb15776f2e168866..3a870e85baa7c9fc04f9e9804319fc23ca3ed9b7 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 a5f5f6937216b4640dd68edaea24dcee9c3ad1e5..ae0a07c6d97dd13e8ed1ddba7366a8bb7bd48d63 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"});