diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-30 17:21:19 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-10-01 09:03:38 +0000 |
commit | b948c83255239a6fe49fca58a98f90e796ce9047 (patch) | |
tree | 39f0b531c0247daeb9f247dce61951529b3fca19 /src/imports/controls | |
parent | 98e7b3cca484df43838fe834dcaf1f97f45c659f (diff) |
Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0
Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls')
27 files changed, 27 insertions, 27 deletions
diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml index 8f3460fe..350843da 100644 --- a/src/imports/controls/ApplicationWindow.qml +++ b/src/imports/controls/ApplicationWindow.qml @@ -37,7 +37,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.ApplicationWindow { id: window diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index e8a4babd..e9a57931 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.BusyIndicator { id: control diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 5c7eaf04..f475ffe9 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.Button { id: control diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index ca61eff3..ae851ce9 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.CheckBox { id: control diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index e09638cd..312ac4dc 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.Dial { id: control diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml index 671a6365..85f38163 100644 --- a/src/imports/controls/Drawer.qml +++ b/src/imports/controls/Drawer.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.Drawer { id: control diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index 72ec0ad6..fe59e908 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.Frame { id: control diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index ac82a263..d178d86b 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.GroupBox { id: control diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index ce67db71..2098e74b 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.Label { id: control diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 408380d8..86b4356f 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.PageIndicator { id: control diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 3a040573..c496dab7 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.ProgressBar { id: control diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 6e13503b..197c05b3 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.RadioButton { id: control diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index c3ae743d..8b22b0c2 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.ScrollBar { id: control diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index b02f6c1f..87bb8872 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.ScrollIndicator { id: control diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 309c07cd..6a53ab64 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.Slider { id: control diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml index 093db0ee..99b1b871 100644 --- a/src/imports/controls/StackView.qml +++ b/src/imports/controls/StackView.qml @@ -36,7 +36,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.StackView { id: root diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml index fb401137..ad5504a8 100644 --- a/src/imports/controls/SwipeView.qml +++ b/src/imports/controls/SwipeView.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.SwipeView { id: control diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 9c05b9de..75925d8a 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.Switch { id: control diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml index e6124209..b0cfcf65 100644 --- a/src/imports/controls/TabBar.qml +++ b/src/imports/controls/TabBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.TabBar { id: control diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 0364385a..9a6a75ca 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.TabButton { id: control diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index fcbe52a7..fbdbc482 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.TextArea { id: control diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 6437a1de..19f19b24 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.TextField { id: control diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index db3d65c1..577a7b8f 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.ToolBar { id: control diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 13c9d13f..7fd41ec7 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.ToolButton { id: control diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 36c84cdb..940130fb 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T T.Tumbler { id: control diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index cab129ed..b03aeb08 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -3,7 +3,7 @@ TARGETPATH = QtQuick/Controls.2 IMPORT_VERSION = 2.0 QT += qml quick -QT += core-private gui-private qml-private quick-private quicktemplates-private +QT += core-private gui-private qml-private quick-private labstemplates-private QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp index d12f164b..ce8bce86 100644 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ b/src/imports/controls/qtquickcontrols2plugin.cpp @@ -38,7 +38,7 @@ #include <QtCore/qfileselector.h> #include <QtCore/qurl.h> -#include <QtQuickTemplates/private/qquickexclusivegroup_p.h> +#include <QtLabsTemplates/private/qquickexclusivegroup_p.h> #include "qquicktheme_p.h" |