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>

4 files changed, 125 insertions, 125 deletions

diff --git a/src/imports/templates/qmldir b/src/imports/templates/qmldir
index a143a6cb..b52c8ba6 100644
--- a/src/imports/templates/qmldir
+++ b/src/imports/templates/qmldir
@@ -1,3 +1,3 @@
-module QtQuick.Templates
-plugin qtquicktemplates2plugin
-classname QtQuickTemplates2Plugin
+module Qt.labs.templates
+plugin qtlabstemplatesplugin
+classname QtLabsTemplatesPlugin
diff --git a/src/imports/templates/qtlabstemplatesplugin.cpp b/src/imports/templates/qtlabstemplatesplugin.cpp
new file mode 100644
index 00000000..9ebd14d9
--- /dev/null
+++ b/src/imports/templates/qtlabstemplatesplugin.cpp
@@ -0,0 +1,117 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the Qt Labs Templates module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL3$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtQml/qqmlextensionplugin.h>
+
+#include <QtLabsTemplates/private/qquickapplicationwindow_p.h>
+#include <QtLabsTemplates/private/qquickbusyindicator_p.h>
+#include <QtLabsTemplates/private/qquickbutton_p.h>
+#include <QtLabsTemplates/private/qquickcheckbox_p.h>
+#include <QtLabsTemplates/private/qquickcontrol_p.h>
+#include <QtLabsTemplates/private/qquickcontainer_p.h>
+#include <QtLabsTemplates/private/qquickdial_p.h>
+#include <QtLabsTemplates/private/qquickdrawer_p.h>
+#include <QtLabsTemplates/private/qquickframe_p.h>
+#include <QtLabsTemplates/private/qquickgroupbox_p.h>
+#include <QtLabsTemplates/private/qquicklabel_p.h>
+#include <QtLabsTemplates/private/qquickpageindicator_p.h>
+#include <QtLabsTemplates/private/qquickprogressbar_p.h>
+#include <QtLabsTemplates/private/qquickradiobutton_p.h>
+#include <QtLabsTemplates/private/qquickscrollbar_p.h>
+#include <QtLabsTemplates/private/qquickscrollindicator_p.h>
+#include <QtLabsTemplates/private/qquickslider_p.h>
+#include <QtLabsTemplates/private/qquickstackview_p.h>
+#include <QtLabsTemplates/private/qquickswipeview_p.h>
+#include <QtLabsTemplates/private/qquickswitch_p.h>
+#include <QtLabsTemplates/private/qquicktabbar_p.h>
+#include <QtLabsTemplates/private/qquicktabbutton_p.h>
+#include <QtLabsTemplates/private/qquicktextarea_p.h>
+#include <QtLabsTemplates/private/qquicktextfield_p.h>
+#include <QtLabsTemplates/private/qquicktoolbar_p.h>
+#include <QtLabsTemplates/private/qquicktoolbutton_p.h>
+#include <QtLabsTemplates/private/qquicktumbler_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QtLabsTemplatesPlugin: public QQmlExtensionPlugin
+{
+    Q_OBJECT
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
+
+public:
+    void registerTypes(const char *uri);
+};
+
+void QtLabsTemplatesPlugin::registerTypes(const char *uri)
+{
+    qmlRegisterType<QQuickApplicationWindow>(uri, 1, 0, "ApplicationWindow");
+    qmlRegisterType<QQuickBusyIndicator>(uri, 1, 0, "BusyIndicator");
+    qmlRegisterType<QQuickButton>(uri, 1, 0, "Button");
+    qmlRegisterType<QQuickCheckBox>(uri, 1, 0, "CheckBox");
+    qmlRegisterType<QQuickContainer>(uri, 1, 0, "Container");
+    qmlRegisterType<QQuickControl>(uri, 1, 0, "Control");
+    qmlRegisterType<QQuickDial>(uri, 1, 0, "Dial");
+    qmlRegisterType<QQuickDrawer>(uri, 1, 0, "Drawer");
+    qmlRegisterType<QQuickFrame>(uri, 1, 0, "Frame");
+    qmlRegisterType<QQuickGroupBox>(uri, 1, 0, "GroupBox");
+    qmlRegisterType<QQuickLabel>(uri, 1, 0, "Label");
+    qmlRegisterType<QQuickPageIndicator>(uri, 1, 0, "PageIndicator");
+    qmlRegisterType<QQuickProgressBar>(uri, 1, 0, "ProgressBar");
+    qmlRegisterType<QQuickRadioButton>(uri, 1, 0, "RadioButton");
+    qmlRegisterType<QQuickScrollBar>(uri, 1, 0, "ScrollBar");
+    qmlRegisterType<QQuickScrollIndicator>(uri, 1, 0, "ScrollIndicator");
+    qmlRegisterType<QQuickSlider>(uri, 1, 0, "Slider");
+    qmlRegisterType<QQuickStackView>(uri, 1, 0, "StackView");
+    qmlRegisterType<QQuickSwipeViewAttached>();
+    qmlRegisterType<QQuickSwipeView>(uri, 1, 0, "SwipeView");
+    qmlRegisterType<QQuickSwitch>(uri, 1, 0, "Switch");
+    qmlRegisterType<QQuickTabBar>(uri, 1, 0, "TabBar");
+    qmlRegisterType<QQuickTabButton>(uri, 1, 0, "TabButton");
+    qmlRegisterType<QQuickTextArea>(uri, 1, 0, "TextArea");
+    qmlRegisterType<QQuickTextField>(uri, 1, 0, "TextField");
+    qmlRegisterType<QQuickToolBar>(uri, 1, 0, "ToolBar");
+    qmlRegisterType<QQuickToolButton>(uri, 1, 0, "ToolButton");
+    qmlRegisterType<QQuickTumblerAttached>();
+    qmlRegisterType<QQuickTumbler>(uri, 1, 0, "Tumbler");
+
+    qmlRegisterRevision<QQuickText, 6>(uri, 1, 0);
+    qmlRegisterRevision<QQuickTextInput, 6>(uri, 1, 0);
+    qmlRegisterRevision<QQuickTextEdit, 6>(uri, 1, 0);
+}
+
+QT_END_NAMESPACE
+
+#include "qtlabstemplatesplugin.moc"
diff --git a/src/imports/templates/qtquicktemplates2plugin.cpp b/src/imports/templates/qtquicktemplates2plugin.cpp
deleted file mode 100644
index 7d25d3db..00000000
--- a/src/imports/templates/qtquicktemplates2plugin.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL3$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPLv3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or later as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 2.0 requirements will be
-** met: http://www.gnu.org/licenses/gpl-2.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QtQml/qqmlextensionplugin.h>
-
-#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
-#include <QtQuickTemplates/private/qquickbusyindicator_p.h>
-#include <QtQuickTemplates/private/qquickbutton_p.h>
-#include <QtQuickTemplates/private/qquickcheckbox_p.h>
-#include <QtQuickTemplates/private/qquickcontrol_p.h>
-#include <QtQuickTemplates/private/qquickcontainer_p.h>
-#include <QtQuickTemplates/private/qquickdial_p.h>
-#include <QtQuickTemplates/private/qquickdrawer_p.h>
-#include <QtQuickTemplates/private/qquickframe_p.h>
-#include <QtQuickTemplates/private/qquickgroupbox_p.h>
-#include <QtQuickTemplates/private/qquicklabel_p.h>
-#include <QtQuickTemplates/private/qquickpageindicator_p.h>
-#include <QtQuickTemplates/private/qquickprogressbar_p.h>
-#include <QtQuickTemplates/private/qquickradiobutton_p.h>
-#include <QtQuickTemplates/private/qquickscrollbar_p.h>
-#include <QtQuickTemplates/private/qquickscrollindicator_p.h>
-#include <QtQuickTemplates/private/qquickslider_p.h>
-#include <QtQuickTemplates/private/qquickstackview_p.h>
-#include <QtQuickTemplates/private/qquickswipeview_p.h>
-#include <QtQuickTemplates/private/qquickswitch_p.h>
-#include <QtQuickTemplates/private/qquicktabbar_p.h>
-#include <QtQuickTemplates/private/qquicktabbutton_p.h>
-#include <QtQuickTemplates/private/qquicktextarea_p.h>
-#include <QtQuickTemplates/private/qquicktextfield_p.h>
-#include <QtQuickTemplates/private/qquicktoolbar_p.h>
-#include <QtQuickTemplates/private/qquicktoolbutton_p.h>
-#include <QtQuickTemplates/private/qquicktumbler_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QtQuickTemplates2Plugin: public QQmlExtensionPlugin
-{
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
-
-public:
-    void registerTypes(const char *uri);
-};
-
-void QtQuickTemplates2Plugin::registerTypes(const char *uri)
-{
-    qmlRegisterType<QQuickApplicationWindow>(uri, 2, 0, "ApplicationWindow");
-    qmlRegisterType<QQuickBusyIndicator>(uri, 2, 0, "BusyIndicator");
-    qmlRegisterType<QQuickButton>(uri, 2, 0, "Button");
-    qmlRegisterType<QQuickCheckBox>(uri, 2, 0, "CheckBox");
-    qmlRegisterType<QQuickContainer>(uri, 2, 0, "Container");
-    qmlRegisterType<QQuickControl>(uri, 2, 0, "Control");
-    qmlRegisterType<QQuickDial>(uri, 2, 0, "Dial");
-    qmlRegisterType<QQuickDrawer>(uri, 2, 0, "Drawer");
-    qmlRegisterType<QQuickFrame>(uri, 2, 0, "Frame");
-    qmlRegisterType<QQuickGroupBox>(uri, 2, 0, "GroupBox");
-    qmlRegisterType<QQuickLabel>(uri, 2, 0, "Label");
-    qmlRegisterType<QQuickPageIndicator>(uri, 2, 0, "PageIndicator");
-    qmlRegisterType<QQuickProgressBar>(uri, 2, 0, "ProgressBar");
-    qmlRegisterType<QQuickRadioButton>(uri, 2, 0, "RadioButton");
-    qmlRegisterType<QQuickScrollBar>(uri, 2, 0, "ScrollBar");
-    qmlRegisterType<QQuickScrollIndicator>(uri, 2, 0, "ScrollIndicator");
-    qmlRegisterType<QQuickSlider>(uri, 2, 0, "Slider");
-    qmlRegisterType<QQuickStackView>(uri, 2, 0, "StackView");
-    qmlRegisterType<QQuickSwipeViewAttached>();
-    qmlRegisterType<QQuickSwipeView>(uri, 2, 0, "SwipeView");
-    qmlRegisterType<QQuickSwitch>(uri, 2, 0, "Switch");
-    qmlRegisterType<QQuickTabBar>(uri, 2, 0, "TabBar");
-    qmlRegisterType<QQuickTabButton>(uri, 2, 0, "TabButton");
-    qmlRegisterType<QQuickTextArea>(uri, 2, 0, "TextArea");
-    qmlRegisterType<QQuickTextField>(uri, 2, 0, "TextField");
-    qmlRegisterType<QQuickToolBar>(uri, 2, 0, "ToolBar");
-    qmlRegisterType<QQuickToolButton>(uri, 2, 0, "ToolButton");
-    qmlRegisterType<QQuickTumblerAttached>();
-    qmlRegisterType<QQuickTumbler>(uri, 2, 0, "Tumbler");
-
-    qmlRegisterRevision<QQuickText, 6>(uri, 2, 0);
-    qmlRegisterRevision<QQuickTextInput, 6>(uri, 2, 0);
-    qmlRegisterRevision<QQuickTextEdit, 6>(uri, 2, 0);
-}
-
-QT_END_NAMESPACE
-
-#include "qtquicktemplates2plugin.moc"
diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro
index 07e96aa1..e49486f7 100644
--- a/src/imports/templates/templates.pro
+++ b/src/imports/templates/templates.pro
@@ -1,15 +1,15 @@
-TARGET  = qtquicktemplates2plugin
-TARGETPATH = QtQuick/Templates.2
-IMPORT_VERSION = 2.0
+TARGET  = qtlabstemplatesplugin
+TARGETPATH = Qt/labs/templates
+IMPORT_VERSION = 1.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
 
 OTHER_FILES += \
     qmldir
 
 SOURCES += \
-    $$PWD/qtquicktemplates2plugin.cpp
+    $$PWD/qtlabstemplatesplugin.cpp
 
 CONFIG += no_cxx_module
 load(qml_plugin)