diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 13:51:20 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-04-21 14:09:05 +0000 |
commit | 6b61cc32deaa202e7f46f4be426329db6a40ac3f (patch) | |
tree | 88056961b1ecc947e7b89f8ea5e7287f35848753 /src/imports/controls/material | |
parent | b44194ecc62e7c2d51a90bad17a41451319f7c1f (diff) |
import Qt.labs.templates 1.0 => QtQuick.Templates 2.0
Even though there never was such thing is QtQuick.Templates 1.0,
we'll use version 2.0 to keep it in sync with QtQuick.Controls 2.0
(next step). The templates define (and in the future, revision) the
API of the controls, so the two must have the same version or it
will get messy.
Docs and plugins.qmltypes will be updated in follow up commits.
Change-Id: Idc2e76f32f348ba35eb4b1fa167c6868300aa910
Task-number: QTBUG-52549
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/controls/material')
39 files changed, 39 insertions, 39 deletions
diff --git a/src/imports/controls/material/ApplicationWindow.qml b/src/imports/controls/material/ApplicationWindow.qml index 6bfa36f8..26604fdb 100644 --- a/src/imports/controls/material/ApplicationWindow.qml +++ b/src/imports/controls/material/ApplicationWindow.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.ApplicationWindow { diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index a3b055df..f631dfb1 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 1e12cb6e..330d2eb8 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import QtGraphicalEffects 1.0 diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 94758b62..e9331f60 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index 70104962..8381aeed 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index b1e35e80..cc5268d1 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -37,7 +37,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 import Qt.labs.controls 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import QtGraphicalEffects 1.0 diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index 7f1c565e..1f1c986c 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.Dial { diff --git a/src/imports/controls/material/Drawer.qml b/src/imports/controls/material/Drawer.qml index 03744cdd..35a362de 100644 --- a/src/imports/controls/material/Drawer.qml +++ b/src/imports/controls/material/Drawer.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtGraphicalEffects 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.Drawer { diff --git a/src/imports/controls/material/Frame.qml b/src/imports/controls/material/Frame.qml index cf50e02a..7a7dacf8 100644 --- a/src/imports/controls/material/Frame.qml +++ b/src/imports/controls/material/Frame.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.Frame { diff --git a/src/imports/controls/material/GroupBox.qml b/src/imports/controls/material/GroupBox.qml index a1b6c980..2d1f80c2 100644 --- a/src/imports/controls/material/GroupBox.qml +++ b/src/imports/controls/material/GroupBox.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.GroupBox { diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index efba10b0..89a870ac 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.ItemDelegate { diff --git a/src/imports/controls/material/Label.qml b/src/imports/controls/material/Label.qml index 03eeb898..c179bdf4 100644 --- a/src/imports/controls/material/Label.qml +++ b/src/imports/controls/material/Label.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.Label { diff --git a/src/imports/controls/material/Menu.qml b/src/imports/controls/material/Menu.qml index 9e4076f1..c53b031c 100644 --- a/src/imports/controls/material/Menu.qml +++ b/src/imports/controls/material/Menu.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import Qt.labs.controls 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import QtGraphicalEffects 1.0 diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 48eb390b..e687a78f 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/Page.qml b/src/imports/controls/material/Page.qml index 451d66f2..adeb8b64 100644 --- a/src/imports/controls/material/Page.qml +++ b/src/imports/controls/material/Page.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.Page { diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index 6e5044e4..6bde1473 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.PageIndicator { diff --git a/src/imports/controls/material/Pane.qml b/src/imports/controls/material/Pane.qml index e862e856..642dc1f1 100644 --- a/src/imports/controls/material/Pane.qml +++ b/src/imports/controls/material/Pane.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.Pane { diff --git a/src/imports/controls/material/Popup.qml b/src/imports/controls/material/Popup.qml index 4b9a9221..bfee632a 100644 --- a/src/imports/controls/material/Popup.qml +++ b/src/imports/controls/material/Popup.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtGraphicalEffects 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.Popup { diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index acefaf7c..a475c648 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index bb71f96e..bcfd071f 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index 5f5f58cf..88c1aa5c 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.RadioDelegate { diff --git a/src/imports/controls/material/RangeSlider.qml b/src/imports/controls/material/RangeSlider.qml index d57624ed..fdca41fb 100644 --- a/src/imports/controls/material/RangeSlider.qml +++ b/src/imports/controls/material/RangeSlider.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index 554cc21d..a930e167 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.ScrollBar { diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml index fc89d0f8..9a7b1b5d 100644 --- a/src/imports/controls/material/ScrollIndicator.qml +++ b/src/imports/controls/material/ScrollIndicator.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.ScrollIndicator { diff --git a/src/imports/controls/material/Slider.qml b/src/imports/controls/material/Slider.qml index 8a80c0aa..3a892fff 100644 --- a/src/imports/controls/material/Slider.qml +++ b/src/imports/controls/material/Slider.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index e34d7943..447ac411 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtGraphicalEffects 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/StackView.qml b/src/imports/controls/material/StackView.qml index 66675e85..f3756307 100644 --- a/src/imports/controls/material/StackView.qml +++ b/src/imports/controls/material/StackView.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.4 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T T.StackView { id: control diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index c4bacc10..da6d7d72 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/SwipeView.qml b/src/imports/controls/material/SwipeView.qml index c7b1e54d..ab53203d 100644 --- a/src/imports/controls/material/SwipeView.qml +++ b/src/imports/controls/material/SwipeView.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T T.SwipeView { id: control diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index 6bc3041a..f256781a 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -37,7 +37,7 @@ import QtQuick 2.6 import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T T.Switch { id: control diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index bb3ef6de..adfd508d 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 import Qt.labs.controls.material.impl 1.0 diff --git a/src/imports/controls/material/TabBar.qml b/src/imports/controls/material/TabBar.qml index 0e1d0ada..4d0ed57c 100644 --- a/src/imports/controls/material/TabBar.qml +++ b/src/imports/controls/material/TabBar.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.TabBar { diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index 70efc0ff..61542fa1 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.TabButton { diff --git a/src/imports/controls/material/TextArea.qml b/src/imports/controls/material/TextArea.qml index b952d319..c087911d 100644 --- a/src/imports/controls/material/TextArea.qml +++ b/src/imports/controls/material/TextArea.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.TextArea { diff --git a/src/imports/controls/material/TextField.qml b/src/imports/controls/material/TextField.qml index 25cd6fe8..d037d491 100644 --- a/src/imports/controls/material/TextField.qml +++ b/src/imports/controls/material/TextField.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.TextField { diff --git a/src/imports/controls/material/ToolBar.qml b/src/imports/controls/material/ToolBar.qml index df606709..432f77fb 100644 --- a/src/imports/controls/material/ToolBar.qml +++ b/src/imports/controls/material/ToolBar.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.ToolBar { diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index e3a1d740..bdb341f6 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.ToolButton { diff --git a/src/imports/controls/material/ToolTip.qml b/src/imports/controls/material/ToolTip.qml index 263f1766..1ca0c127 100644 --- a/src/imports/controls/material/ToolTip.qml +++ b/src/imports/controls/material/ToolTip.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.ToolTip { diff --git a/src/imports/controls/material/Tumbler.qml b/src/imports/controls/material/Tumbler.qml index fe7954a9..959415f2 100644 --- a/src/imports/controls/material/Tumbler.qml +++ b/src/imports/controls/material/Tumbler.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import Qt.labs.controls 1.0 -import Qt.labs.templates 1.0 as T +import QtQuick.Templates 2.0 as T import Qt.labs.controls.material 1.0 T.Tumbler { |