From 298440bd118b90cba548617ccbd5178bf29ec525 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 3 Oct 2016 16:45:47 +0200 Subject: Update all QtQuick imports in src/imports/controls Most were importing 2.6, some 2.4, and some 2.7. Use consistently the latest available Qt Quick version 2.8. This can be easily tracked to the corresponding Qt version. Change-Id: Ic231b3cc0cb5d2d5cf806fe11c4ff3fd557d09e0 Reviewed-by: Mitch Curtis --- src/imports/controls/AbstractButton.qml | 2 +- src/imports/controls/ApplicationWindow.qml | 2 +- src/imports/controls/BusyIndicator.qml | 2 +- src/imports/controls/Button.qml | 2 +- src/imports/controls/CheckBox.qml | 2 +- src/imports/controls/CheckDelegate.qml | 2 +- src/imports/controls/CheckIndicator.qml | 2 +- src/imports/controls/ComboBox.qml | 2 +- src/imports/controls/Container.qml | 2 +- src/imports/controls/Control.qml | 2 +- src/imports/controls/Dial.qml | 2 +- src/imports/controls/Dialog.qml | 2 +- src/imports/controls/DialogButtonBox.qml | 2 +- src/imports/controls/Drawer.qml | 2 +- src/imports/controls/Frame.qml | 2 +- src/imports/controls/GroupBox.qml | 2 +- src/imports/controls/ItemDelegate.qml | 2 +- src/imports/controls/Label.qml | 2 +- src/imports/controls/Menu.qml | 2 +- src/imports/controls/MenuItem.qml | 2 +- src/imports/controls/MenuSeparator.qml | 2 +- src/imports/controls/Page.qml | 2 +- src/imports/controls/PageIndicator.qml | 2 +- src/imports/controls/Pane.qml | 2 +- src/imports/controls/Popup.qml | 2 +- src/imports/controls/ProgressBar.qml | 2 +- src/imports/controls/RadioButton.qml | 2 +- src/imports/controls/RadioDelegate.qml | 2 +- src/imports/controls/RadioIndicator.qml | 2 +- src/imports/controls/RangeSlider.qml | 2 +- src/imports/controls/RoundButton.qml | 2 +- src/imports/controls/ScrollBar.qml | 2 +- src/imports/controls/ScrollIndicator.qml | 2 +- src/imports/controls/Slider.qml | 2 +- src/imports/controls/SpinBox.qml | 2 +- src/imports/controls/StackView.qml | 2 +- src/imports/controls/SwipeDelegate.qml | 2 +- src/imports/controls/SwipeView.qml | 2 +- src/imports/controls/Switch.qml | 2 +- src/imports/controls/SwitchDelegate.qml | 2 +- src/imports/controls/SwitchIndicator.qml | 2 +- src/imports/controls/TabBar.qml | 2 +- src/imports/controls/TabButton.qml | 2 +- src/imports/controls/TextArea.qml | 2 +- src/imports/controls/TextField.qml | 2 +- src/imports/controls/ToolBar.qml | 2 +- src/imports/controls/ToolButton.qml | 2 +- src/imports/controls/ToolSeparator.qml | 2 +- src/imports/controls/ToolTip.qml | 2 +- src/imports/controls/Tumbler.qml | 2 +- src/imports/controls/material/ApplicationWindow.qml | 2 +- src/imports/controls/material/BoxShadow.qml | 2 +- src/imports/controls/material/BusyIndicator.qml | 2 +- src/imports/controls/material/Button.qml | 2 +- src/imports/controls/material/CheckBox.qml | 2 +- src/imports/controls/material/CheckDelegate.qml | 2 +- src/imports/controls/material/CheckIndicator.qml | 2 +- src/imports/controls/material/ComboBox.qml | 2 +- src/imports/controls/material/Dial.qml | 2 +- src/imports/controls/material/Dialog.qml | 2 +- src/imports/controls/material/DialogButtonBox.qml | 2 +- src/imports/controls/material/Drawer.qml | 2 +- src/imports/controls/material/ElevationEffect.qml | 2 +- src/imports/controls/material/Frame.qml | 2 +- src/imports/controls/material/GroupBox.qml | 2 +- src/imports/controls/material/ItemDelegate.qml | 2 +- src/imports/controls/material/Label.qml | 2 +- src/imports/controls/material/Menu.qml | 2 +- src/imports/controls/material/MenuItem.qml | 2 +- src/imports/controls/material/MenuSeparator.qml | 2 +- src/imports/controls/material/Page.qml | 2 +- src/imports/controls/material/PageIndicator.qml | 2 +- src/imports/controls/material/Pane.qml | 2 +- src/imports/controls/material/Popup.qml | 2 +- src/imports/controls/material/ProgressBar.qml | 2 +- src/imports/controls/material/RadioButton.qml | 2 +- src/imports/controls/material/RadioDelegate.qml | 2 +- src/imports/controls/material/RadioIndicator.qml | 2 +- src/imports/controls/material/RangeSlider.qml | 2 +- src/imports/controls/material/RoundButton.qml | 2 +- src/imports/controls/material/ScrollBar.qml | 2 +- src/imports/controls/material/ScrollIndicator.qml | 2 +- src/imports/controls/material/Slider.qml | 2 +- src/imports/controls/material/SliderHandle.qml | 2 +- src/imports/controls/material/SpinBox.qml | 2 +- src/imports/controls/material/StackView.qml | 2 +- src/imports/controls/material/SwipeDelegate.qml | 2 +- src/imports/controls/material/SwipeView.qml | 2 +- src/imports/controls/material/Switch.qml | 2 +- src/imports/controls/material/SwitchDelegate.qml | 2 +- src/imports/controls/material/SwitchIndicator.qml | 2 +- src/imports/controls/material/TabBar.qml | 2 +- src/imports/controls/material/TabButton.qml | 2 +- src/imports/controls/material/TextArea.qml | 2 +- src/imports/controls/material/TextField.qml | 2 +- src/imports/controls/material/ToolBar.qml | 2 +- src/imports/controls/material/ToolButton.qml | 2 +- src/imports/controls/material/ToolSeparator.qml | 2 +- src/imports/controls/material/ToolTip.qml | 2 +- src/imports/controls/material/Tumbler.qml | 2 +- src/imports/controls/universal/ApplicationWindow.qml | 2 +- src/imports/controls/universal/BusyIndicator.qml | 2 +- src/imports/controls/universal/Button.qml | 2 +- src/imports/controls/universal/CheckBox.qml | 2 +- src/imports/controls/universal/CheckDelegate.qml | 2 +- src/imports/controls/universal/CheckIndicator.qml | 2 +- src/imports/controls/universal/ComboBox.qml | 2 +- src/imports/controls/universal/Dial.qml | 2 +- src/imports/controls/universal/Dialog.qml | 2 +- src/imports/controls/universal/DialogButtonBox.qml | 2 +- src/imports/controls/universal/Drawer.qml | 2 +- src/imports/controls/universal/Frame.qml | 2 +- src/imports/controls/universal/GroupBox.qml | 2 +- src/imports/controls/universal/ItemDelegate.qml | 2 +- src/imports/controls/universal/Label.qml | 2 +- src/imports/controls/universal/Menu.qml | 2 +- src/imports/controls/universal/MenuItem.qml | 2 +- src/imports/controls/universal/MenuSeparator.qml | 2 +- src/imports/controls/universal/Page.qml | 2 +- src/imports/controls/universal/PageIndicator.qml | 2 +- src/imports/controls/universal/Pane.qml | 2 +- src/imports/controls/universal/Popup.qml | 2 +- src/imports/controls/universal/ProgressBar.qml | 2 +- src/imports/controls/universal/RadioButton.qml | 2 +- src/imports/controls/universal/RadioDelegate.qml | 2 +- src/imports/controls/universal/RadioIndicator.qml | 2 +- src/imports/controls/universal/RangeSlider.qml | 2 +- src/imports/controls/universal/RoundButton.qml | 2 +- src/imports/controls/universal/ScrollBar.qml | 2 +- src/imports/controls/universal/ScrollIndicator.qml | 2 +- src/imports/controls/universal/Slider.qml | 2 +- src/imports/controls/universal/SpinBox.qml | 2 +- src/imports/controls/universal/StackView.qml | 2 +- src/imports/controls/universal/SwipeDelegate.qml | 2 +- src/imports/controls/universal/Switch.qml | 2 +- src/imports/controls/universal/SwitchDelegate.qml | 2 +- src/imports/controls/universal/SwitchIndicator.qml | 2 +- src/imports/controls/universal/TabBar.qml | 2 +- src/imports/controls/universal/TabButton.qml | 2 +- src/imports/controls/universal/TextArea.qml | 2 +- src/imports/controls/universal/TextField.qml | 2 +- src/imports/controls/universal/ToolBar.qml | 2 +- src/imports/controls/universal/ToolButton.qml | 2 +- src/imports/controls/universal/ToolSeparator.qml | 2 +- src/imports/controls/universal/ToolTip.qml | 2 +- src/imports/controls/universal/Tumbler.qml | 2 +- 146 files changed, 146 insertions(+), 146 deletions(-) (limited to 'src') diff --git a/src/imports/controls/AbstractButton.qml b/src/imports/controls/AbstractButton.qml index 487b452b..f6b0009d 100644 --- a/src/imports/controls/AbstractButton.qml +++ b/src/imports/controls/AbstractButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.0 as T T.AbstractButton { diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml index 32065f02..e82430e5 100644 --- a/src/imports/controls/ApplicationWindow.qml +++ b/src/imports/controls/ApplicationWindow.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Window 2.2 diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index 06c263a6..936764fa 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index af2e0aea..6bf30df0 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 690aeff2..dcfb54a7 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml index f980690f..ad4bb44f 100644 --- a/src/imports/controls/CheckDelegate.qml +++ b/src/imports/controls/CheckDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/CheckIndicator.qml b/src/imports/controls/CheckIndicator.qml index 7f3e7e6f..b3d1b25e 100644 --- a/src/imports/controls/CheckIndicator.qml +++ b/src/imports/controls/CheckIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index a024f20b..85a9cc13 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Window 2.2 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/Container.qml b/src/imports/controls/Container.qml index 9e9215f8..2499e678 100644 --- a/src/imports/controls/Container.qml +++ b/src/imports/controls/Container.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.0 as T T.Container { diff --git a/src/imports/controls/Control.qml b/src/imports/controls/Control.qml index a4bb95fe..b5200e33 100644 --- a/src/imports/controls/Control.qml +++ b/src/imports/controls/Control.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.0 as T T.Control { diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index cc202772..f19fcc2b 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Dialog.qml b/src/imports/controls/Dialog.qml index c90ae6fc..a2522398 100644 --- a/src/imports/controls/Dialog.qml +++ b/src/imports/controls/Dialog.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/DialogButtonBox.qml b/src/imports/controls/DialogButtonBox.qml index 4d8da360..9f4ebce5 100644 --- a/src/imports/controls/DialogButtonBox.qml +++ b/src/imports/controls/DialogButtonBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T T.DialogButtonBox { diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml index 689b6240..90fef012 100644 --- a/src/imports/controls/Drawer.qml +++ b/src/imports/controls/Drawer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index ef716f72..eae1f25d 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index 1b3afd66..a761c8dc 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml index 98b6c617..a1bf9b22 100644 --- a/src/imports/controls/ItemDelegate.qml +++ b/src/imports/controls/ItemDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index a3b8d1f9..c492cd7a 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Menu.qml b/src/imports/controls/Menu.qml index 9f5bb517..0461b2b6 100644 --- a/src/imports/controls/Menu.qml +++ b/src/imports/controls/Menu.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index f9c5ba88..0d4b609d 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/MenuSeparator.qml index 0038109f..ef075ef9 100644 --- a/src/imports/controls/MenuSeparator.qml +++ b/src/imports/controls/MenuSeparator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Page.qml b/src/imports/controls/Page.qml index 39080de7..630f8426 100644 --- a/src/imports/controls/Page.qml +++ b/src/imports/controls/Page.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 29c6231e..b546a9cc 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Pane.qml b/src/imports/controls/Pane.qml index 3f6e43a9..482ec18b 100644 --- a/src/imports/controls/Pane.qml +++ b/src/imports/controls/Pane.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Popup.qml b/src/imports/controls/Popup.qml index 92ac19ed..476a1882 100644 --- a/src/imports/controls/Popup.qml +++ b/src/imports/controls/Popup.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index b09eae1e..a0d0912a 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 119909ef..80e4e182 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml index d156d9ee..85e66aa0 100644 --- a/src/imports/controls/RadioDelegate.qml +++ b/src/imports/controls/RadioDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/RadioIndicator.qml b/src/imports/controls/RadioIndicator.qml index 7fb855d9..43159e6c 100644 --- a/src/imports/controls/RadioIndicator.qml +++ b/src/imports/controls/RadioIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/RangeSlider.qml b/src/imports/controls/RangeSlider.qml index 14d7e271..6b892fd1 100644 --- a/src/imports/controls/RangeSlider.qml +++ b/src/imports/controls/RangeSlider.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml index f0edb4e8..15c01b48 100644 --- a/src/imports/controls/RoundButton.qml +++ b/src/imports/controls/RoundButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index 6f4386f9..fcca30e8 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 15a9822a..50f58575 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 7c34cc9f..f7e95db9 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index e7c3dbf5..0a562110 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml index 610b3418..93e4503f 100644 --- a/src/imports/controls/StackView.qml +++ b/src/imports/controls/StackView.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml index 729f623d..8b9c9f2f 100644 --- a/src/imports/controls/SwipeDelegate.qml +++ b/src/imports/controls/SwipeDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml index 53310810..cd026f7c 100644 --- a/src/imports/controls/SwipeView.qml +++ b/src/imports/controls/SwipeView.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 33304cdd..16f2744f 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml index decec965..8f2af81c 100644 --- a/src/imports/controls/SwitchDelegate.qml +++ b/src/imports/controls/SwitchDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/SwitchIndicator.qml b/src/imports/controls/SwitchIndicator.qml index e71b606f..37c23d80 100644 --- a/src/imports/controls/SwitchIndicator.qml +++ b/src/imports/controls/SwitchIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml index 2c3a665b..8b23c94a 100644 --- a/src/imports/controls/TabBar.qml +++ b/src/imports/controls/TabBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T T.TabBar { diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 446d6004..824c2737 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index aaf69bb3..734cc9d0 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index bb21ce84..e58b94c0 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index cc61a95b..f5e5076c 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 5d33e3e5..f92845f8 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/ToolSeparator.qml index 894a5f97..dca746d7 100644 --- a/src/imports/controls/ToolSeparator.qml +++ b/src/imports/controls/ToolSeparator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/ToolTip.qml b/src/imports/controls/ToolTip.qml index 304296dd..783dc224 100644 --- a/src/imports/controls/ToolTip.qml +++ b/src/imports/controls/ToolTip.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 4c1e5ecd..6c89b86d 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml index 0514e5e3..0a6b71a3 100644 --- a/src/imports/controls/material/ApplicationWindow.qml +++ b/src/imports/controls/material/ApplicationWindow.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Window 2.2 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/BoxShadow.qml b/src/imports/controls/material/BoxShadow.qml index 02950a60..4809838e 100644 --- a/src/imports/controls/material/BoxShadow.qml +++ b/src/imports/controls/material/BoxShadow.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index c2851b91..3077ceb7 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 57cd44e6..971992ab 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 290dbe55..60b23004 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index 99b24f09..c932b69e 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml index a373bdb8..afc19bc2 100644 --- a/src/imports/controls/material/CheckIndicator.qml +++ b/src/imports/controls/material/CheckIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index 7376aecc..6847ba6a 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Window 2.2 import QtQuick.Controls 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index 7fbf351c..9f5d88c3 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/Dialog.qml b/src/imports/controls/material/Dialog.qml index 8141eb8c..58bbe99e 100644 --- a/src/imports/controls/material/Dialog.qml +++ b/src/imports/controls/material/Dialog.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml index 46a2b3ba..312aa4eb 100644 --- a/src/imports/controls/material/DialogButtonBox.qml +++ b/src/imports/controls/material/DialogButtonBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml index d6603b04..a4b2e3bc 100644 --- a/src/imports/controls/material/Drawer.qml +++ b/src/imports/controls/material/Drawer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/ElevationEffect.qml b/src/imports/controls/material/ElevationEffect.qml index 00d7b997..3cf6623c 100644 --- a/src/imports/controls/material/ElevationEffect.qml +++ b/src/imports/controls/material/ElevationEffect.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml index 45b8b263..08c01353 100644 --- a/src/imports/controls/material/Frame.qml +++ b/src/imports/controls/material/Frame.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index 945c5a8c..afd1c8d1 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index 647c3147..ec03b129 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml index 3a69207f..f4e12813 100644 --- a/src/imports/controls/material/Label.qml +++ b/src/imports/controls/material/Label.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index ed21dc46..7fe6af0e 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index d3348d35..09a9909c 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/MenuSeparator.qml b/src/imports/controls/material/MenuSeparator.qml index c6ba401f..76cac31b 100644 --- a/src/imports/controls/material/MenuSeparator.qml +++ b/src/imports/controls/material/MenuSeparator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index 887a139d..ec343d04 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index d413adcc..7378dbbf 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml index 95e0a8c2..4aedbd40 100644 --- a/src/imports/controls/material/Pane.qml +++ b/src/imports/controls/material/Pane.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index 2654aaf4..01b3951a 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index fa7867e6..2b78be49 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index a2450f49..c3afbfd9 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index d1fa5e0e..150d72ae 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/RadioIndicator.qml b/src/imports/controls/material/RadioIndicator.qml index 2a2fabe4..b1e19656 100644 --- a/src/imports/controls/material/RadioIndicator.qml +++ b/src/imports/controls/material/RadioIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml index c2672703..641c00f1 100644 --- a/src/imports/controls/material/RangeSlider.qml +++ b/src/imports/controls/material/RangeSlider.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml index 57f30e30..c020db74 100644 --- a/src/imports/controls/material/RoundButton.qml +++ b/src/imports/controls/material/RoundButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 4547a903..afc30723 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml index 1e0fd8ff..3b1dd2c3 100644 --- a/src/imports/controls/material/ScrollIndicator.qml +++ b/src/imports/controls/material/ScrollIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml index dd6063bb..1c915b32 100644 --- a/src/imports/controls/material/Slider.qml +++ b/src/imports/controls/material/Slider.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/SliderHandle.qml b/src/imports/controls/material/SliderHandle.qml index 1c02cf16..ba6260e9 100644 --- a/src/imports/controls/material/SliderHandle.qml +++ b/src/imports/controls/material/SliderHandle.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index 74811c16..4058077b 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/StackView.qml b/src/imports/controls/material/StackView.qml index dcbe0ad0..916e910f 100644 --- a/src/imports/controls/material/StackView.qml +++ b/src/imports/controls/material/StackView.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.4 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T T.StackView { diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index 329322e2..6f614833 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/SwipeView.qml b/src/imports/controls/material/SwipeView.qml index 0cdd0758..3ac373d5 100644 --- a/src/imports/controls/material/SwipeView.qml +++ b/src/imports/controls/material/SwipeView.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T T.SwipeView { diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index 32f083f8..b833fbbf 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index 2134cfd1..da084168 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/SwitchIndicator.qml b/src/imports/controls/material/SwitchIndicator.qml index 114c3956..c59e6ac2 100644 --- a/src/imports/controls/material/SwitchIndicator.qml +++ b/src/imports/controls/material/SwitchIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml index 5b2c8888..1c3b5c0c 100644 --- a/src/imports/controls/material/TabBar.qml +++ b/src/imports/controls/material/TabBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index b2106626..0fb16e63 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index 3a95600e..f8734ad1 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index 25811322..a8eae1e2 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index ac6e8bf3..38acf43e 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 6105d1e7..dbeb7a05 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Material.impl 2.1 diff --git a/src/imports/controls/material/ToolSeparator.qml b/src/imports/controls/material/ToolSeparator.qml index f48fffd4..c241750a 100644 --- a/src/imports/controls/material/ToolSeparator.qml +++ b/src/imports/controls/material/ToolSeparator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml index d055bae6..455f79c6 100644 --- a/src/imports/controls/material/ToolTip.qml +++ b/src/imports/controls/material/ToolTip.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Material 2.1 diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index 255d4b5d..88750855 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.impl 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/universal/ApplicationWindow.qml b/src/imports/controls/universal/ApplicationWindow.qml index bd3185a4..ba07021a 100644 --- a/src/imports/controls/universal/ApplicationWindow.qml +++ b/src/imports/controls/universal/ApplicationWindow.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 import QtQuick.Controls.Universal.impl 2.1 diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index 35b27bf8..514a233e 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 import QtQuick.Controls.Universal.impl 2.1 diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index f784c670..30d30380 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index d856f3ea..bfaf266e 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 import QtQuick.Controls.Universal.impl 2.1 diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index cd7245fa..e48687e5 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/CheckIndicator.qml b/src/imports/controls/universal/CheckIndicator.qml index 2a985e2e..166cf184 100644 --- a/src/imports/controls/universal/CheckIndicator.qml +++ b/src/imports/controls/universal/CheckIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index 461291f9..39cd7d20 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Window 2.2 import QtQuick.Controls 2.1 import QtQuick.Templates 2.1 as T diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index 64dca3da..d50b066b 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Dialog.qml b/src/imports/controls/universal/Dialog.qml index bda9bbb1..e282d055 100644 --- a/src/imports/controls/universal/Dialog.qml +++ b/src/imports/controls/universal/Dialog.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls 2.1 import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml index 4c1926da..4c2481c9 100644 --- a/src/imports/controls/universal/DialogButtonBox.qml +++ b/src/imports/controls/universal/DialogButtonBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Drawer.qml b/src/imports/controls/universal/Drawer.qml index 846d7031..09b3751d 100644 --- a/src/imports/controls/universal/Drawer.qml +++ b/src/imports/controls/universal/Drawer.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Frame.qml b/src/imports/controls/universal/Frame.qml index 9bd34292..1c83f3fd 100644 --- a/src/imports/controls/universal/Frame.qml +++ b/src/imports/controls/universal/Frame.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/GroupBox.qml b/src/imports/controls/universal/GroupBox.qml index d45505c7..435a9755 100644 --- a/src/imports/controls/universal/GroupBox.qml +++ b/src/imports/controls/universal/GroupBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index e0189082..afba2b10 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Label.qml b/src/imports/controls/universal/Label.qml index c7210137..9e377f61 100644 --- a/src/imports/controls/universal/Label.qml +++ b/src/imports/controls/universal/Label.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Menu.qml b/src/imports/controls/universal/Menu.qml index 603c2c44..afae51f0 100644 --- a/src/imports/controls/universal/Menu.qml +++ b/src/imports/controls/universal/Menu.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index a1c51eed..24f34440 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/MenuSeparator.qml b/src/imports/controls/universal/MenuSeparator.qml index d62d2b6c..cd79c60f 100644 --- a/src/imports/controls/universal/MenuSeparator.qml +++ b/src/imports/controls/universal/MenuSeparator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Page.qml b/src/imports/controls/universal/Page.qml index 4f2d6ff7..7b7efa44 100644 --- a/src/imports/controls/universal/Page.qml +++ b/src/imports/controls/universal/Page.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml index 401b391e..817c89fb 100644 --- a/src/imports/controls/universal/PageIndicator.qml +++ b/src/imports/controls/universal/PageIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Pane.qml b/src/imports/controls/universal/Pane.qml index 2a459630..903e501a 100644 --- a/src/imports/controls/universal/Pane.qml +++ b/src/imports/controls/universal/Pane.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Popup.qml b/src/imports/controls/universal/Popup.qml index 67dfa45c..53178b71 100644 --- a/src/imports/controls/universal/Popup.qml +++ b/src/imports/controls/universal/Popup.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index 3ebe17cd..cd314c27 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 import QtQuick.Controls.Universal.impl 2.1 diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index 7331879e..99a5c6d6 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 import QtQuick.Controls.Universal.impl 2.1 diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 15ca2180..0794a082 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/RadioIndicator.qml b/src/imports/controls/universal/RadioIndicator.qml index dfccf759..c745b04e 100644 --- a/src/imports/controls/universal/RadioIndicator.qml +++ b/src/imports/controls/universal/RadioIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Controls.Universal 2.1 Rectangle { diff --git a/src/imports/controls/universal/RangeSlider.qml b/src/imports/controls/universal/RangeSlider.qml index d66e26a7..0b78962e 100644 --- a/src/imports/controls/universal/RangeSlider.qml +++ b/src/imports/controls/universal/RangeSlider.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/RoundButton.qml b/src/imports/controls/universal/RoundButton.qml index 61701099..6062b985 100644 --- a/src/imports/controls/universal/RoundButton.qml +++ b/src/imports/controls/universal/RoundButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index 4e654132..7c1242fb 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index a8cd71af..f03bc819 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Slider.qml b/src/imports/controls/universal/Slider.qml index 3ae6a578..b059a9c5 100644 --- a/src/imports/controls/universal/Slider.qml +++ b/src/imports/controls/universal/Slider.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index 0e7143f6..b527fc8f 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/StackView.qml b/src/imports/controls/universal/StackView.qml index b30684f6..6e6d1b50 100644 --- a/src/imports/controls/universal/StackView.qml +++ b/src/imports/controls/universal/StackView.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index 77df02cf..71720ef2 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 44aa190d..23703dee 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index 9c715d06..b45a3795 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/SwitchIndicator.qml b/src/imports/controls/universal/SwitchIndicator.qml index 82875568..0f68d26a 100644 --- a/src/imports/controls/universal/SwitchIndicator.qml +++ b/src/imports/controls/universal/SwitchIndicator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/TabBar.qml b/src/imports/controls/universal/TabBar.qml index 1cf895de..a8d80fec 100644 --- a/src/imports/controls/universal/TabBar.qml +++ b/src/imports/controls/universal/TabBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.7 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index e9971298..2b54b30f 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/TextArea.qml b/src/imports/controls/universal/TextArea.qml index 0e2953ed..57ccaac2 100644 --- a/src/imports/controls/universal/TextArea.qml +++ b/src/imports/controls/universal/TextArea.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/TextField.qml b/src/imports/controls/universal/TextField.qml index afa09946..6395e995 100644 --- a/src/imports/controls/universal/TextField.qml +++ b/src/imports/controls/universal/TextField.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ToolBar.qml b/src/imports/controls/universal/ToolBar.qml index 5535a337..35f79806 100644 --- a/src/imports/controls/universal/ToolBar.qml +++ b/src/imports/controls/universal/ToolBar.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index 45bf96ec..ee00ca54 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ToolSeparator.qml b/src/imports/controls/universal/ToolSeparator.qml index 31990954..a4a5f18c 100644 --- a/src/imports/controls/universal/ToolSeparator.qml +++ b/src/imports/controls/universal/ToolSeparator.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/ToolTip.qml b/src/imports/controls/universal/ToolTip.qml index 23f9d695..bd3d54e7 100644 --- a/src/imports/controls/universal/ToolTip.qml +++ b/src/imports/controls/universal/ToolTip.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 diff --git a/src/imports/controls/universal/Tumbler.qml b/src/imports/controls/universal/Tumbler.qml index 7d639421..e7093d0a 100644 --- a/src/imports/controls/universal/Tumbler.qml +++ b/src/imports/controls/universal/Tumbler.qml @@ -34,7 +34,7 @@ ** ****************************************************************************/ -import QtQuick 2.6 +import QtQuick 2.8 import QtQuick.Templates 2.1 as T import QtQuick.Controls.Universal 2.1 import QtQuick.Controls 2.1 -- cgit v1.2.3 From 4205b25129e2d6691cc5def4e2b4b6a89e9d1f1b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 4 Oct 2016 10:08:16 +0200 Subject: Improve the type registration version comments Change-Id: I6a5f42e341f213676146bc2a9540c63d3435ffa3 Reviewed-by: Mitch Curtis --- src/imports/controls/qtquickcontrols2plugin.cpp | 6 +++--- src/imports/templates/qtquicktemplates2plugin.cpp | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 1b75636a..2394966a 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -77,9 +77,6 @@ QtQuickControls2Plugin::QtQuickControls2Plugin(QObject *parent) : QQuickStylePlu void QtQuickControls2Plugin::registerTypes(const char *uri) { - qmlRegisterType(uri, 2, 0, "ButtonGroup"); - qmlRegisterType(); - QQuickStylePrivate::init(typeUrl()); const QString style = QQuickStyle::name(); if (!style.isEmpty()) @@ -88,10 +85,13 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) QQuickStyleSelector selector; selector.setBaseUrl(typeUrl()); + // QtQuick.Controls 2.0 (Qt 5.7) qmlRegisterType(selector.select(QStringLiteral("AbstractButton.qml")), uri, 2, 0, "AbstractButton"); qmlRegisterType(selector.select(QStringLiteral("ApplicationWindow.qml")), uri, 2, 0, "ApplicationWindow"); qmlRegisterType(selector.select(QStringLiteral("BusyIndicator.qml")), uri, 2, 0, "BusyIndicator"); qmlRegisterType(selector.select(QStringLiteral("Button.qml")), uri, 2, 0, "Button"); + qmlRegisterType(uri, 2, 0, "ButtonGroup"); + qmlRegisterType(); qmlRegisterType(selector.select(QStringLiteral("CheckBox.qml")), uri, 2, 0, "CheckBox"); qmlRegisterType(selector.select(QStringLiteral("CheckDelegate.qml")), uri, 2, 0, "CheckDelegate"); qmlRegisterType(selector.select(QStringLiteral("ComboBox.qml")), uri, 2, 0, "ComboBox"); diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp index 9a9215d9..cc344a80 100644 --- a/src/imports/templates/qtquicktemplates2plugin.cpp +++ b/src/imports/templates/qtquicktemplates2plugin.cpp @@ -112,6 +112,7 @@ QtQuickTemplates2Plugin::QtQuickTemplates2Plugin(QObject *parent) : QQmlExtensio void QtQuickTemplates2Plugin::registerTypes(const char *uri) { + // QtQuick.Templates 2.0 (Qt 5.7) qmlRegisterType(uri, 2, 0, "AbstractButton"); qmlRegisterType(uri, 2, 0, "ApplicationWindow"); qmlRegisterType(); @@ -177,7 +178,7 @@ void QtQuickTemplates2Plugin::registerTypes(const char *uri) qmlRegisterRevision(uri, 2, 0); qmlRegisterRevision(uri, 2, 0); - // QtQuick.Controls 2.1 (Qt 5.8) + // QtQuick.Templates 2.1 (Qt 5.8) qmlRegisterType(uri, 2, 1, "ButtonGroup"); qmlRegisterType(uri, 2, 1, "ComboBox"); qmlRegisterType(uri, 2, 1, "Container"); -- cgit v1.2.3 From 18f42239d4c2fa0d3eec4d74f1ff8dd4e27e2f01 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 4 Oct 2016 10:37:53 +0200 Subject: Update a few outdated QtQuick.Templates imports in src/imports/controls These files have been merged from 5.7 and therefore import 2.0, whereas all others import 2.1. Change-Id: I95bb2879fb1615ab1fd65ce0a8495c9fe53b0679 Reviewed-by: Mitch Curtis --- src/imports/controls/AbstractButton.qml | 2 +- src/imports/controls/Container.qml | 2 +- src/imports/controls/Control.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/imports/controls/AbstractButton.qml b/src/imports/controls/AbstractButton.qml index f6b0009d..a45c6816 100644 --- a/src/imports/controls/AbstractButton.qml +++ b/src/imports/controls/AbstractButton.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T T.AbstractButton { id: control diff --git a/src/imports/controls/Container.qml b/src/imports/controls/Container.qml index 2499e678..d3aa89bc 100644 --- a/src/imports/controls/Container.qml +++ b/src/imports/controls/Container.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T T.Container { id: control diff --git a/src/imports/controls/Control.qml b/src/imports/controls/Control.qml index b5200e33..92b1cfd2 100644 --- a/src/imports/controls/Control.qml +++ b/src/imports/controls/Control.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.8 -import QtQuick.Templates 2.0 as T +import QtQuick.Templates 2.1 as T T.Control { id: control -- cgit v1.2.3 From 9f8b28f6c3359e8933a3453fd7d601047ff11606 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 4 Oct 2016 23:34:03 +0200 Subject: Update plugins.qmltypes Change-Id: I276dbd1464577fdee9c6920deb38e890c1a18daf Reviewed-by: J-P Nurmi --- src/imports/controls/plugins.qmltypes | 68 ++++++++++++++++++++++++++++------ src/imports/platform/plugins.qmltypes | 66 ++++++++++++++++++++++++++++++++- src/imports/templates/plugins.qmltypes | 13 +------ 3 files changed, 124 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes index d34c5656..d1adb16c 100644 --- a/src/imports/controls/plugins.qmltypes +++ b/src/imports/controls/plugins.qmltypes @@ -19,6 +19,53 @@ Module { exports: ["QtQuick.Controls.impl/BusyRing 2.0"] exportMetaObjectRevisions: [0] } + Component { + name: "QQuickDefaultStyle" + prototype: "QObject" + exports: ["QtQuick.Controls.impl/Default 2.1"] + isCreatable: false + isSingleton: true + exportMetaObjectRevisions: [0] + Property { name: "backgroundColor"; type: "QColor"; isReadonly: true } + Property { name: "overlayModalColor"; type: "QColor"; isReadonly: true } + Property { name: "overlayDimColor"; type: "QColor"; isReadonly: true } + Property { name: "textColor"; type: "QColor"; isReadonly: true } + Property { name: "textDarkColor"; type: "QColor"; isReadonly: true } + Property { name: "textLightColor"; type: "QColor"; isReadonly: true } + Property { name: "textLinkColor"; type: "QColor"; isReadonly: true } + Property { name: "textSelectionColor"; type: "QColor"; isReadonly: true } + Property { name: "textDisabledColor"; type: "QColor"; isReadonly: true } + Property { name: "textDisabledLightColor"; type: "QColor"; isReadonly: true } + Property { name: "focusColor"; type: "QColor"; isReadonly: true } + Property { name: "focusLightColor"; type: "QColor"; isReadonly: true } + Property { name: "focusPressedColor"; type: "QColor"; isReadonly: true } + Property { name: "buttonColor"; type: "QColor"; isReadonly: true } + Property { name: "buttonPressedColor"; type: "QColor"; isReadonly: true } + Property { name: "buttonCheckedColor"; type: "QColor"; isReadonly: true } + Property { name: "buttonCheckedPressedColor"; type: "QColor"; isReadonly: true } + Property { name: "buttonCheckedFocusColor"; type: "QColor"; isReadonly: true } + Property { name: "toolButtonColor"; type: "QColor"; isReadonly: true } + Property { name: "tabButtonColor"; type: "QColor"; isReadonly: true } + Property { name: "tabButtonPressedColor"; type: "QColor"; isReadonly: true } + Property { name: "tabButtonCheckedPressedColor"; type: "QColor"; isReadonly: true } + Property { name: "delegateColor"; type: "QColor"; isReadonly: true } + Property { name: "delegatePressedColor"; type: "QColor"; isReadonly: true } + Property { name: "delegateFocusColor"; type: "QColor"; isReadonly: true } + Property { name: "indicatorPressedColor"; type: "QColor"; isReadonly: true } + Property { name: "indicatorDisabledColor"; type: "QColor"; isReadonly: true } + Property { name: "indicatorFrameColor"; type: "QColor"; isReadonly: true } + Property { name: "indicatorFramePressedColor"; type: "QColor"; isReadonly: true } + Property { name: "indicatorFrameDisabledColor"; type: "QColor"; isReadonly: true } + Property { name: "frameDarkColor"; type: "QColor"; isReadonly: true } + Property { name: "frameLightColor"; type: "QColor"; isReadonly: true } + Property { name: "scrollBarColor"; type: "QColor"; isReadonly: true } + Property { name: "scrollBarPressedColor"; type: "QColor"; isReadonly: true } + Property { name: "progressBarColor"; type: "QColor"; isReadonly: true } + Property { name: "pageIndicatorColor"; type: "QColor"; isReadonly: true } + Property { name: "separatorColor"; type: "QColor"; isReadonly: true } + Property { name: "disabledDarkColor"; type: "QColor"; isReadonly: true } + Property { name: "disabledLightColor"; type: "QColor"; isReadonly: true } + } Component { name: "QQuickDialRing" defaultProperty: "data" @@ -47,6 +94,14 @@ Module { Property { name: "delegate"; type: "QQmlComponent"; isPointer: true } Property { name: "path"; type: "QQuickPath"; isPointer: true } } + Component { + prototype: "QQuickAbstractButton" + name: "QtQuick.Controls/AbstractButton 2.0" + exports: ["QtQuick.Controls/AbstractButton 2.0"] + exportMetaObjectRevisions: [0] + isComposite: true + defaultProperty: "data" + } Component { prototype: "QQuickApplicationWindow" name: "QtQuick.Controls/ApplicationWindow 2.0" @@ -897,11 +952,8 @@ Module { name: "QQuickPopup" defaultProperty: "contentData" prototype: "QObject" - exports: [ - "QtQuick.Templates/Popup 2.0", - "QtQuick.Templates/Popup 2.1" - ] - exportMetaObjectRevisions: [0, 1] + exports: ["QtQuick.Templates/Popup 2.0"] + exportMetaObjectRevisions: [0] Enum { name: "ClosePolicy" values: { @@ -948,8 +1000,6 @@ Module { Property { name: "leftPadding"; type: "double" } Property { name: "rightPadding"; type: "double" } Property { name: "bottomPadding"; type: "double" } - Property { name: "allowVerticalFlip"; revision: 1; type: "bool" } - Property { name: "allowHorizontalFlip"; revision: 1; type: "bool" } Property { name: "locale"; type: "QLocale" } Property { name: "font"; type: "QFont" } Property { name: "parent"; type: "QQuickItem"; isPointer: true } @@ -969,8 +1019,6 @@ Module { Property { name: "transformOrigin"; type: "TransformOrigin" } Property { name: "enter"; type: "QQuickTransition"; isPointer: true } Property { name: "exit"; type: "QQuickTransition"; isPointer: true } - Signal { name: "allowVerticalFlipChanged"; revision: 1 } - Signal { name: "allowHorizontalFlipChanged"; revision: 1 } Signal { name: "windowChanged" Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } @@ -1495,8 +1543,6 @@ Module { Property { name: "delay"; type: "int" } Property { name: "timeout"; type: "int" } Property { name: "text"; type: "string" } - Method { name: "open" } - Method { name: "close" } } Component { name: "QQuickToolTipAttached" diff --git a/src/imports/platform/plugins.qmltypes b/src/imports/platform/plugins.qmltypes index 01d8eb94..6913405b 100644 --- a/src/imports/platform/plugins.qmltypes +++ b/src/imports/platform/plugins.qmltypes @@ -7,7 +7,7 @@ import QtQuick.tooling 1.2 // 'qmlplugindump -nonrelocatable Qt.labs.platform 1.0' Module { - dependencies: ["QtQuick 2.7"] + dependencies: ["QtQuick 2.8"] Component { name: "QPlatformDialogHelper" prototype: "QObject" @@ -355,6 +355,70 @@ Module { Signal { name: "resetClicked" } Signal { name: "restoreDefaultsClicked" } } + Component { + name: "QQuickPlatformStandardPaths" + prototype: "QObject" + exports: ["Qt.labs.platform/StandardPaths 1.0"] + isCreatable: false + isSingleton: true + exportMetaObjectRevisions: [0] + Method { + name: "displayName" + type: "string" + Parameter { name: "type"; type: "QStandardPaths::StandardLocation" } + } + Method { + name: "findExecutable" + type: "QUrl" + Parameter { name: "executableName"; type: "string" } + Parameter { name: "paths"; type: "QStringList" } + } + Method { + name: "findExecutable" + type: "QUrl" + Parameter { name: "executableName"; type: "string" } + } + Method { + name: "locate" + type: "QUrl" + Parameter { name: "type"; type: "QStandardPaths::StandardLocation" } + Parameter { name: "fileName"; type: "string" } + Parameter { name: "options"; type: "QStandardPaths::LocateOptions" } + } + Method { + name: "locate" + type: "QUrl" + Parameter { name: "type"; type: "QStandardPaths::StandardLocation" } + Parameter { name: "fileName"; type: "string" } + } + Method { + name: "locateAll" + type: "QList" + Parameter { name: "type"; type: "QStandardPaths::StandardLocation" } + Parameter { name: "fileName"; type: "string" } + Parameter { name: "options"; type: "QStandardPaths::LocateOptions" } + } + Method { + name: "locateAll" + type: "QList" + Parameter { name: "type"; type: "QStandardPaths::StandardLocation" } + Parameter { name: "fileName"; type: "string" } + } + Method { + name: "setTestModeEnabled" + Parameter { name: "testMode"; type: "bool" } + } + Method { + name: "standardLocations" + type: "QList" + Parameter { name: "type"; type: "QStandardPaths::StandardLocation" } + } + Method { + name: "writableLocation" + type: "QUrl" + Parameter { name: "type"; type: "QStandardPaths::StandardLocation" } + } + } Component { name: "QQuickPlatformSystemTrayIcon" prototype: "QObject" diff --git a/src/imports/templates/plugins.qmltypes b/src/imports/templates/plugins.qmltypes index fc5c980e..002ea9b7 100644 --- a/src/imports/templates/plugins.qmltypes +++ b/src/imports/templates/plugins.qmltypes @@ -462,11 +462,8 @@ Module { name: "QQuickPopup" defaultProperty: "contentData" prototype: "QObject" - exports: [ - "QtQuick.Templates/Popup 2.0", - "QtQuick.Templates/Popup 2.1" - ] - exportMetaObjectRevisions: [0, 1] + exports: ["QtQuick.Templates/Popup 2.0"] + exportMetaObjectRevisions: [0] Enum { name: "ClosePolicy" values: { @@ -513,8 +510,6 @@ Module { Property { name: "leftPadding"; type: "double" } Property { name: "rightPadding"; type: "double" } Property { name: "bottomPadding"; type: "double" } - Property { name: "allowVerticalFlip"; revision: 1; type: "bool" } - Property { name: "allowHorizontalFlip"; revision: 1; type: "bool" } Property { name: "locale"; type: "QLocale" } Property { name: "font"; type: "QFont" } Property { name: "parent"; type: "QQuickItem"; isPointer: true } @@ -534,8 +529,6 @@ Module { Property { name: "transformOrigin"; type: "TransformOrigin" } Property { name: "enter"; type: "QQuickTransition"; isPointer: true } Property { name: "exit"; type: "QQuickTransition"; isPointer: true } - Signal { name: "allowVerticalFlipChanged"; revision: 1 } - Signal { name: "allowHorizontalFlipChanged"; revision: 1 } Signal { name: "windowChanged" Parameter { name: "window"; type: "QQuickWindow"; isPointer: true } @@ -1060,8 +1053,6 @@ Module { Property { name: "delay"; type: "int" } Property { name: "timeout"; type: "int" } Property { name: "text"; type: "string" } - Method { name: "open" } - Method { name: "close" } } Component { name: "QQuickToolTipAttached" -- cgit v1.2.3 From 0f06accc02f8c06fccdfe80a769e6ee50bf5eb14 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 4 Oct 2016 17:00:09 +0200 Subject: Remove wrong Container revision registration We register Container.qml for QtQuick.Controls 2.0, so it is important to not override the registration with plain QQuickContainer template revision 1 for QtQuick.Controls 2.1, or else the behavior of Container will be different depending on whether the user imports QtQuick Controls 2.0 or 2.1. The auto test started failing when the import version was bumped from 2.0 to 2.1. This revealed that "Container" was pointing to Container.qml in 2.0, and to QQuickContainer in 2.1. Change-Id: I80b8de3bf556c57e4ae853b116d387431dfa02c7 Reviewed-by: Mitch Curtis --- src/imports/controls/qtquickcontrols2plugin.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src') diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index 2394966a..5b8868fe 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -41,7 +41,6 @@ #include #include #include -#include #include #include "qquickbusyindicatorring_p.h" @@ -133,7 +132,6 @@ void QtQuickControls2Plugin::registerTypes(const char *uri) // QtQuick.Controls 2.1 (Qt 5.8) qmlRegisterType(uri, 2, 1, "ButtonGroup"); - qmlRegisterType(uri, 2, 1, "Container"); qmlRegisterType(selector.select(QStringLiteral("Dialog.qml")), uri, 2, 1, "Dialog"); qmlRegisterType(selector.select(QStringLiteral("DialogButtonBox.qml")), uri, 2, 1, "DialogButtonBox"); qmlRegisterType(selector.select(QStringLiteral("MenuSeparator.qml")), uri, 2, 1, "MenuSeparator"); -- cgit v1.2.3 From 2f4a059881dbec289d86abc7456b42d5eec77ceb Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Wed, 5 Oct 2016 13:23:04 +0200 Subject: Doc: corrected \sa statement contentChildren MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Error: qquickmenu.cpp:405: warning: Can't link to 'contentChildren' Change-Id: Ia2bf8b271576ace946d9942bd6d80f50b60944b1 Reviewed-by: Mitch Curtis Reviewed-by: Topi Reiniö --- src/quicktemplates2/qquickmenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/quicktemplates2/qquickmenu.cpp b/src/quicktemplates2/qquickmenu.cpp index bf37f801..80ad5b68 100644 --- a/src/quicktemplates2/qquickmenu.cpp +++ b/src/quicktemplates2/qquickmenu.cpp @@ -415,7 +415,7 @@ QVariant QQuickMenu::contentModel() const \note Unlike \c contentChildren, \c contentData does include non-visual QML objects. It is not re-ordered when items are inserted or moved. - \sa Item::data, contentChildren + \sa Item::data, Popup::contentChildren */ QQmlListProperty QQuickMenu::contentData() { -- cgit v1.2.3