aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-03-06 09:50:55 +0100
committerJari-Pekka Nurmi <jpnurmi@theqtcompany.com>2015-03-06 10:51:40 +0200
commit9dbc52655f893a7537be770f96c0722fa9160823 (patch)
tree7df6dcc12b004e1d9a4f7f9abb22ec94ca65287b
parentf50aafacfa18bf7ab12433076ef95d9af9b80c71 (diff)
import QtQuick 2.6
Change-Id: I2a8a1c6884e65383f0938763497a419d2f0fcbd6 Reviewed-by: Jari-Pekka Nurmi <jpnurmi@theqtcompany.com>
-rw-r--r--examples/quick/calendar/main.qml2
-rw-r--r--examples/quick/controls/drawer/main.qml2
-rw-r--r--examples/quick/controls/mirroring/main.qml2
-rw-r--r--examples/quick/controls/styles/main.qml2
-rw-r--r--examples/quick/controls/tabs/main.qml2
-rw-r--r--src/imports/calendar/CalendarDelegate.qml2
-rw-r--r--src/imports/calendar/CalendarView.qml2
-rw-r--r--src/imports/calendar/DayOfWeekRow.qml2
-rw-r--r--src/imports/calendar/WeekNumberColumn.qml2
-rw-r--r--src/imports/controls/ApplicationWindow.qml2
-rw-r--r--src/imports/controls/BusyIndicator.qml2
-rw-r--r--src/imports/controls/Button.qml2
-rw-r--r--src/imports/controls/CheckBox.qml2
-rw-r--r--src/imports/controls/Frame.qml2
-rw-r--r--src/imports/controls/GroupBox.qml2
-rw-r--r--src/imports/controls/Label.qml2
-rw-r--r--src/imports/controls/PageIndicator.qml2
-rw-r--r--src/imports/controls/ProgressBar.qml2
-rw-r--r--src/imports/controls/RadioButton.qml2
-rw-r--r--src/imports/controls/ScrollBar.qml2
-rw-r--r--src/imports/controls/ScrollIndicator.qml2
-rw-r--r--src/imports/controls/Slider.qml2
-rw-r--r--src/imports/controls/SpinBox.qml2
-rw-r--r--src/imports/controls/Switch.qml2
-rw-r--r--src/imports/controls/TabBar.qml2
-rw-r--r--src/imports/controls/TabButton.qml2
-rw-r--r--src/imports/controls/TabView.qml2
-rw-r--r--src/imports/controls/TextArea.qml2
-rw-r--r--src/imports/controls/ToggleButton.qml2
-rw-r--r--src/imports/controls/ToolBar.qml2
-rw-r--r--src/imports/controls/ToolButton.qml2
-rw-r--r--src/imports/extras/Drawer.qml2
32 files changed, 32 insertions, 32 deletions
diff --git a/examples/quick/calendar/main.qml b/examples/quick/calendar/main.qml
index 686e59e1..759a081e 100644
--- a/examples/quick/calendar/main.qml
+++ b/examples/quick/calendar/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Calendar 2.0
import io.qt.examples.calendar 1.0
diff --git a/examples/quick/controls/drawer/main.qml b/examples/quick/controls/drawer/main.qml
index 1615e02a..df46577b 100644
--- a/examples/quick/controls/drawer/main.qml
+++ b/examples/quick/controls/drawer/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Extras 2.0
diff --git a/examples/quick/controls/mirroring/main.qml b/examples/quick/controls/mirroring/main.qml
index 0bbc8530..8aeae85f 100644
--- a/examples/quick/controls/mirroring/main.qml
+++ b/examples/quick/controls/mirroring/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Layouts 1.0
import QtQuick.Controls 2.0
diff --git a/examples/quick/controls/styles/main.qml b/examples/quick/controls/styles/main.qml
index 09fca221..1d0dd20b 100644
--- a/examples/quick/controls/styles/main.qml
+++ b/examples/quick/controls/styles/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.6
import QtQuick.Controls 2.0
ApplicationWindow {
diff --git a/examples/quick/controls/tabs/main.qml b/examples/quick/controls/tabs/main.qml
index 518707ed..48daaa51 100644
--- a/examples/quick/controls/tabs/main.qml
+++ b/examples/quick/controls/tabs/main.qml
@@ -38,7 +38,7 @@
**
****************************************************************************/
-import QtQuick 2.2
+import QtQuick 2.6
import QtQuick.Layouts 1.0
import QtQuick.Controls 2.0
import QtQuick.XmlListModel 2.0
diff --git a/src/imports/calendar/CalendarDelegate.qml b/src/imports/calendar/CalendarDelegate.qml
index a6b000b7..dde7360f 100644
--- a/src/imports/calendar/CalendarDelegate.qml
+++ b/src/imports/calendar/CalendarDelegate.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Calendar 2.0
diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml
index f1a6f598..3dfe5074 100644
--- a/src/imports/calendar/CalendarView.qml
+++ b/src/imports/calendar/CalendarView.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Calendar 2.0
diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml
index 71c47f8e..6c03ddd6 100644
--- a/src/imports/calendar/DayOfWeekRow.qml
+++ b/src/imports/calendar/DayOfWeekRow.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Calendar 2.0
diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml
index fe165090..15037be1 100644
--- a/src/imports/calendar/WeekNumberColumn.qml
+++ b/src/imports/calendar/WeekNumberColumn.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Calendar 2.0
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml
index 036630e4..b64770a8 100644
--- a/src/imports/controls/ApplicationWindow.qml
+++ b/src/imports/controls/ApplicationWindow.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Window 2.2
import QtQuick.Controls 2.0
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml
index 690940b0..1fb1df53 100644
--- a/src/imports/controls/BusyIndicator.qml
+++ b/src/imports/controls/BusyIndicator.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractBusyIndicator {
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index b54856a9..9780b6b1 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractButton {
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 559fda3b..a0ab0358 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractCheckBox {
diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml
index bff6dd68..251d10ca 100644
--- a/src/imports/controls/Frame.qml
+++ b/src/imports/controls/Frame.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractFrame {
diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml
index f3f032a8..773f1092 100644
--- a/src/imports/controls/GroupBox.qml
+++ b/src/imports/controls/GroupBox.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractGroupBox {
diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml
index 872cb978..f258791d 100644
--- a/src/imports/controls/Label.qml
+++ b/src/imports/controls/Label.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
Text {
diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml
index 28913866..0fb1a018 100644
--- a/src/imports/controls/PageIndicator.qml
+++ b/src/imports/controls/PageIndicator.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractPageIndicator {
diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml
index 9e136fc2..6ff666e7 100644
--- a/src/imports/controls/ProgressBar.qml
+++ b/src/imports/controls/ProgressBar.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractProgressBar {
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 51fb0192..8a916270 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/RadioButton.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractRadioButton {
diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml
index 704ad503..956401b3 100644
--- a/src/imports/controls/ScrollBar.qml
+++ b/src/imports/controls/ScrollBar.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractScrollBar {
diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml
index 1fc1ddda..a6684330 100644
--- a/src/imports/controls/ScrollIndicator.qml
+++ b/src/imports/controls/ScrollIndicator.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractScrollIndicator {
diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml
index 5af9ec59..819d8f28 100644
--- a/src/imports/controls/Slider.qml
+++ b/src/imports/controls/Slider.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractSlider {
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index cf11cfdb..455ea08d 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractSpinBox {
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index 0b69000f..e602a86a 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractSwitch {
diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml
index 499a5ec1..4748647d 100644
--- a/src/imports/controls/TabBar.qml
+++ b/src/imports/controls/TabBar.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractTabBar {
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index 9a67b31e..9a527463 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractTabButton {
diff --git a/src/imports/controls/TabView.qml b/src/imports/controls/TabView.qml
index bf785520..19c75691 100644
--- a/src/imports/controls/TabView.qml
+++ b/src/imports/controls/TabView.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQml.Models 2.1
diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml
index ea2bb68e..f4810031 100644
--- a/src/imports/controls/TextArea.qml
+++ b/src/imports/controls/TextArea.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractTextArea {
diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml
index 4f82d7fb..61fd69dd 100644
--- a/src/imports/controls/ToggleButton.qml
+++ b/src/imports/controls/ToggleButton.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractToggleButton {
diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml
index f91a2d15..7806a1fc 100644
--- a/src/imports/controls/ToolBar.qml
+++ b/src/imports/controls/ToolBar.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractToolBar {
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 5e21374d..f03b35c6 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
AbstractButton {
diff --git a/src/imports/extras/Drawer.qml b/src/imports/extras/Drawer.qml
index 6a5a9950..831c18d8 100644
--- a/src/imports/extras/Drawer.qml
+++ b/src/imports/extras/Drawer.qml
@@ -34,7 +34,7 @@
**
****************************************************************************/
-import QtQuick 2.4
+import QtQuick 2.6
import QtQuick.Controls 2.0
import QtQuick.Extras 2.0