diff options
Diffstat (limited to 'src/imports')
38 files changed, 159 insertions, 159 deletions
diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro index 1498c081..ff71c324 100644 --- a/src/imports/calendar/calendar.pro +++ b/src/imports/calendar/calendar.pro @@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/calendar 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 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/src/imports/calendar/qquickcalendarview.cpp b/src/imports/calendar/qquickcalendarview.cpp index 2b470e70..705ec8f7 100644 --- a/src/imports/calendar/qquickcalendarview.cpp +++ b/src/imports/calendar/qquickcalendarview.cpp @@ -39,7 +39,7 @@ #include <QtGui/qstylehints.h> #include <QtGui/qguiapplication.h> -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickcalendarview_p.h b/src/imports/calendar/qquickcalendarview_p.h index 27b5c988..02afe3b4 100644 --- a/src/imports/calendar/qquickcalendarview_p.h +++ b/src/imports/calendar/qquickcalendarview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> #include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index ba9e27e5..e5e452e8 100644 --- a/src/imports/calendar/qquickdayofweekrow.cpp +++ b/src/imports/calendar/qquickdayofweekrow.cpp @@ -37,7 +37,7 @@ #include "qquickdayofweekrow_p.h" #include "qquickdayofweekmodel_p.h" -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickdayofweekrow_p.h b/src/imports/calendar/qquickdayofweekrow_p.h index 4a89c262..5161ed89 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> #include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index 5a884eb6..21540607 100644 --- a/src/imports/calendar/qquickweeknumbercolumn.cpp +++ b/src/imports/calendar/qquickweeknumbercolumn.cpp @@ -37,7 +37,7 @@ #include "qquickweeknumbercolumn_p.h" #include "qquickweeknumbermodel_p.h" -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index 743f6e33..f23d2948 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> #include <QtCore/qlocale.h> QT_BEGIN_NAMESPACE 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" 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) |