diff options
129 files changed, 340 insertions, 340 deletions
@@ -23,7 +23,7 @@ /tests/auto/snippets/screenshots/*.png /src/controls/doc/qtquickcontrols2.tags -/src/templates/QtQuickTemplates.version +/src/templates/QtLabsTemplates.version *.so *.so.* diff --git a/examples/labs/calendar/DateTimePicker.qml b/examples/labs/calendar/DateTimePicker.qml index 96da4175..e7b2c227 100644 --- a/examples/labs/calendar/DateTimePicker.qml +++ b/examples/labs/calendar/DateTimePicker.qml @@ -41,7 +41,7 @@ import QtQuick 2.6 import Qt.labs.calendar 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T Item { id: dateTimePicker diff --git a/examples/labs/calendar/TumblerDelegate.qml b/examples/labs/calendar/TumblerDelegate.qml index e9c7a143..fb360cd5 100644 --- a/examples/labs/calendar/TumblerDelegate.qml +++ b/examples/labs/calendar/TumblerDelegate.qml @@ -40,7 +40,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 Text { text: isNaN(modelData) ? modelData : modelData + 1 diff --git a/examples/labs/calendar/main.qml b/examples/labs/calendar/main.qml index ca23b166..d543aeb5 100644 --- a/examples/labs/calendar/main.qml +++ b/examples/labs/calendar/main.qml @@ -41,7 +41,7 @@ import QtQuick 2.6 import QtQuick.Controls 2.0 import Qt.labs.calendar 1.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T import QtQuick.Layouts 1.0 import io.qt.examples.calendar 1.0 diff --git a/examples/quick/controls/mirroring/main.qml b/examples/quick/controls/mirroring/main.qml index 6f834b34..471f3397 100644 --- a/examples/quick/controls/mirroring/main.qml +++ b/examples/quick/controls/mirroring/main.qml @@ -41,7 +41,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T ApplicationWindow { id: window diff --git a/examples/quick/controls/tabs/main.qml b/examples/quick/controls/tabs/main.qml index 42800236..cf6093b6 100644 --- a/examples/quick/controls/tabs/main.qml +++ b/examples/quick/controls/tabs/main.qml @@ -41,7 +41,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T import QtQuick.XmlListModel 2.0 ApplicationWindow { diff --git a/examples/quick/controls/theme/main.qml b/examples/quick/controls/theme/main.qml index b889bb13..882b426e 100644 --- a/examples/quick/controls/theme/main.qml +++ b/examples/quick/controls/theme/main.qml @@ -40,7 +40,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 ApplicationWindow { id: window 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) diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp index 26a397d6..50f82e45 100644 --- a/src/templates/qquickabstractbutton.cpp +++ b/src/templates/qquickabstractbutton.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h index 75901430..38ca75c0 100644 --- a/src/templates/qquickabstractbutton_p.h +++ b/src/templates/qquickabstractbutton_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE class QQuickAbstractButtonPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL) diff --git a/src/templates/qquickabstractbutton_p_p.h b/src/templates/qquickabstractbutton_p_p.h index 91519c3f..f0e6561d 100644 --- a/src/templates/qquickabstractbutton_p_p.h +++ b/src/templates/qquickabstractbutton_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp index facb325d..c9a7ffcd 100644 --- a/src/templates/qquickapplicationwindow.cpp +++ b/src/templates/qquickapplicationwindow.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h index 50caa3b2..9c1d9816 100644 --- a/src/templates/qquickapplicationwindow_p.h +++ b/src/templates/qquickapplicationwindow_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -49,13 +49,13 @@ // #include <QtQuick/private/qquickwindowmodule_p.h> -#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h> +#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> QT_BEGIN_NAMESPACE class QQuickApplicationWindowPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl +class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl { Q_OBJECT Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) diff --git a/src/templates/qquickbusyindicator.cpp b/src/templates/qquickbusyindicator.cpp index 3c7eb9e6..fb8f56d1 100644 --- a/src/templates/qquickbusyindicator.cpp +++ b/src/templates/qquickbusyindicator.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickbusyindicator_p.h b/src/templates/qquickbusyindicator_p.h index 62039462..8b6446da 100644 --- a/src/templates/qquickbusyindicator_p.h +++ b/src/templates/qquickbusyindicator_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE class QQuickBusyIndicatorPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickBusyIndicator : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickBusyIndicator : public QQuickControl { Q_OBJECT Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged FINAL) diff --git a/src/templates/qquickbutton.cpp b/src/templates/qquickbutton.cpp index f84489a2..4e3e5010 100644 --- a/src/templates/qquickbutton.cpp +++ b/src/templates/qquickbutton.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickbutton_p.h b/src/templates/qquickbutton_p.h index 633b8b3d..1ee96a07 100644 --- a/src/templates/qquickbutton_p.h +++ b/src/templates/qquickbutton_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickabstractbutton_p.h> +#include <QtLabsTemplates/private/qquickabstractbutton_p.h> QT_BEGIN_NAMESPACE class QQuickButtonPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickButton : public QQuickAbstractButton +class Q_LABSTEMPLATES_EXPORT QQuickButton : public QQuickAbstractButton { Q_OBJECT diff --git a/src/templates/qquickcheckable.cpp b/src/templates/qquickcheckable.cpp index 9f37906b..faff0073 100644 --- a/src/templates/qquickcheckable.cpp +++ b/src/templates/qquickcheckable.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickcheckable_p.h b/src/templates/qquickcheckable_p.h index 3c2683c4..da5faacf 100644 --- a/src/templates/qquickcheckable_p.h +++ b/src/templates/qquickcheckable_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickabstractbutton_p.h> +#include <QtLabsTemplates/private/qquickabstractbutton_p.h> QT_BEGIN_NAMESPACE class QQuickCheckablePrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickCheckable : public QQuickAbstractButton +class Q_LABSTEMPLATES_EXPORT QQuickCheckable : public QQuickAbstractButton { Q_OBJECT Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY checkedChanged FINAL) diff --git a/src/templates/qquickcheckable_p_p.h b/src/templates/qquickcheckable_p_p.h index 510a3588..57aa0db2 100644 --- a/src/templates/qquickcheckable_p_p.h +++ b/src/templates/qquickcheckable_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickabstractbutton_p_p.h> +#include <QtLabsTemplates/private/qquickabstractbutton_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/templates/qquickcheckbox.cpp b/src/templates/qquickcheckbox.cpp index 3d9b0704..29e0dccd 100644 --- a/src/templates/qquickcheckbox.cpp +++ b/src/templates/qquickcheckbox.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickcheckbox_p.h b/src/templates/qquickcheckbox_p.h index a420655f..e192a237 100644 --- a/src/templates/qquickcheckbox_p.h +++ b/src/templates/qquickcheckbox_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,11 +48,11 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcheckable_p.h> +#include <QtLabsTemplates/private/qquickcheckable_p.h> QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES_EXPORT QQuickCheckBox : public QQuickCheckable +class Q_LABSTEMPLATES_EXPORT QQuickCheckBox : public QQuickCheckable { Q_OBJECT diff --git a/src/templates/qquickcontainer.cpp b/src/templates/qquickcontainer.cpp index cc415eab..4fe8a9d2 100644 --- a/src/templates/qquickcontainer.cpp +++ b/src/templates/qquickcontainer.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickcontainer_p.h b/src/templates/qquickcontainer_p.h index 0f3c9d0b..51b3ab19 100644 --- a/src/templates/qquickcontainer_p.h +++ b/src/templates/qquickcontainer_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,14 +48,14 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> #include <QtQml/qqmllist.h> QT_BEGIN_NAMESPACE class QQuickContainerPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickContainer : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickContainer : public QQuickControl { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged FINAL) diff --git a/src/templates/qquickcontainer_p_p.h b/src/templates/qquickcontainer_p_p.h index 0e148d7b..1011a331 100644 --- a/src/templates/qquickcontainer_p_p.h +++ b/src/templates/qquickcontainer_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> #include <QtQuick/private/qquickitemchangelistener_p.h> #include <QtQml/private/qqmlobjectmodel_p.h> QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener +class Q_LABSTEMPLATES_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickContainer) diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index a132e83e..bd45f47b 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index 78513381..daf1738e 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -49,13 +49,13 @@ // #include <QtQuick/qquickitem.h> -#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h> +#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> QT_BEGIN_NAMESPACE class QQuickControlPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickControl : public QQuickItem +class Q_LABSTEMPLATES_EXPORT QQuickControl : public QQuickItem { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged) diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h index a76e4e6d..58f3e557 100644 --- a/src/templates/qquickcontrol_p_p.h +++ b/src/templates/qquickcontrol_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickAccessibleAttached; -class Q_QUICKTEMPLATES_EXPORT QQuickControlPrivate : public QQuickItemPrivate +class Q_LABSTEMPLATES_EXPORT QQuickControlPrivate : public QQuickItemPrivate { Q_DECLARE_PUBLIC(QQuickControl) diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp index 4bc62f02..c1c0cc20 100644 --- a/src/templates/qquickdial.cpp +++ b/src/templates/qquickdial.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -38,7 +38,7 @@ #include <QtCore/qmath.h> #include <QtQuick/private/qquickflickable_p.h> -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/templates/qquickdial_p.h b/src/templates/qquickdial_p.h index 738d9b58..6ed7a2b8 100644 --- a/src/templates/qquickdial_p.h +++ b/src/templates/qquickdial_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -50,14 +50,14 @@ #include <QtCore/qvariant.h> #include <QtQml/qqmlcomponent.h> -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE class QQuickDialAttached; class QQuickDialPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickDial : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickDial : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) diff --git a/src/templates/qquickdrawer.cpp b/src/templates/qquickdrawer.cpp index 23988432..8752c803 100644 --- a/src/templates/qquickdrawer.cpp +++ b/src/templates/qquickdrawer.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -40,7 +40,7 @@ #include <QtGui/private/qguiapplication_p.h> #include <QtQuick/private/qquickwindow_p.h> #include <QtQuick/private/qquickanimation_p.h> -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/templates/qquickdrawer_p.h b/src/templates/qquickdrawer_p.h index 42c55481..c05ad036 100644 --- a/src/templates/qquickdrawer_p.h +++ b/src/templates/qquickdrawer_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,14 +48,14 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE class QQuickPropertyAnimation; class QQuickDrawerPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickDrawer : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickDrawer : public QQuickControl { Q_OBJECT Q_PROPERTY(Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged FINAL) diff --git a/src/templates/qquickexclusivegroup.cpp b/src/templates/qquickexclusivegroup.cpp index 967d3288..8ac6d3b4 100644 --- a/src/templates/qquickexclusivegroup.cpp +++ b/src/templates/qquickexclusivegroup.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickexclusivegroup_p.h b/src/templates/qquickexclusivegroup_p.h index 2b4a460f..8d2da53c 100644 --- a/src/templates/qquickexclusivegroup_p.h +++ b/src/templates/qquickexclusivegroup_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -49,7 +49,7 @@ // #include <QtCore/qobject.h> -#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h> +#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> #include <QtQml/qqml.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ class QQuickExclusiveGroupPrivate; class QQuickExclusiveGroupAttached; class QQuickExclusiveGroupAttachedPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickExclusiveGroup : public QObject +class Q_LABSTEMPLATES_EXPORT QQuickExclusiveGroup : public QObject { Q_OBJECT Q_PROPERTY(QObject *current READ current WRITE setCurrent NOTIFY currentChanged) @@ -90,7 +90,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_updateCurrent()) }; -class Q_QUICKTEMPLATES_EXPORT QQuickExclusiveGroupAttached : public QObject +class Q_LABSTEMPLATES_EXPORT QQuickExclusiveGroupAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickExclusiveGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL) diff --git a/src/templates/qquickframe.cpp b/src/templates/qquickframe.cpp index 9281e087..824b7b56 100644 --- a/src/templates/qquickframe.cpp +++ b/src/templates/qquickframe.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickframe_p.h b/src/templates/qquickframe_p.h index c25e7fed..7d4db523 100644 --- a/src/templates/qquickframe_p.h +++ b/src/templates/qquickframe_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,14 +48,14 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> #include <QtQml/qqmllist.h> QT_BEGIN_NAMESPACE class QQuickFramePrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickFrame : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickFrame : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL) diff --git a/src/templates/qquickframe_p_p.h b/src/templates/qquickframe_p_p.h index efaa1b9c..d1ebeae3 100644 --- a/src/templates/qquickframe_p_p.h +++ b/src/templates/qquickframe_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,11 +48,11 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES_EXPORT QQuickFramePrivate : public QQuickControlPrivate +class Q_LABSTEMPLATES_EXPORT QQuickFramePrivate : public QQuickControlPrivate { public: QQuickFramePrivate(); diff --git a/src/templates/qquickgroupbox.cpp b/src/templates/qquickgroupbox.cpp index e421fce3..735b7e05 100644 --- a/src/templates/qquickgroupbox.cpp +++ b/src/templates/qquickgroupbox.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickgroupbox_p.h b/src/templates/qquickgroupbox_p.h index 36665710..dfaa6de0 100644 --- a/src/templates/qquickgroupbox_p.h +++ b/src/templates/qquickgroupbox_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickframe_p.h> +#include <QtLabsTemplates/private/qquickframe_p.h> QT_BEGIN_NAMESPACE class QQuickGroupBoxPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickGroupBox : public QQuickFrame +class Q_LABSTEMPLATES_EXPORT QQuickGroupBox : public QQuickFrame { Q_OBJECT Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) diff --git a/src/templates/qquicklabel.cpp b/src/templates/qquicklabel.cpp index dae9c7f1..a977313e 100644 --- a/src/templates/qquicklabel.cpp +++ b/src/templates/qquicklabel.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquicklabel_p.h b/src/templates/qquicklabel_p.h index 931a7b1d..153f9c8c 100644 --- a/src/templates/qquicklabel_p.h +++ b/src/templates/qquicklabel_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -49,13 +49,13 @@ // #include <QtQuick/private/qquicktext_p.h> -#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h> +#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> QT_BEGIN_NAMESPACE class QQuickLabelPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickLabel : public QQuickText +class Q_LABSTEMPLATES_EXPORT QQuickLabel : public QQuickText { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override diff --git a/src/templates/qquicklabel_p_p.h b/src/templates/qquicklabel_p_p.h index 5d0a4752..16a66cc6 100644 --- a/src/templates/qquicklabel_p_p.h +++ b/src/templates/qquicklabel_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp index ceb83ba7..3f5d9c9e 100644 --- a/src/templates/qquickpageindicator.cpp +++ b/src/templates/qquickpageindicator.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickpageindicator_p.h b/src/templates/qquickpageindicator_p.h index e1c865dd..f9f72577 100644 --- a/src/templates/qquickpageindicator_p.h +++ b/src/templates/qquickpageindicator_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> #include <QtGui/qcolor.h> QT_BEGIN_NAMESPACE @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QQmlComponent; class QQuickPageIndicatorPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickPageIndicator : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickPageIndicator : public QQuickControl { Q_OBJECT Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL) diff --git a/src/templates/qquickpressandholdhelper.cpp b/src/templates/qquickpressandholdhelper.cpp index 38cd871c..29b3bb0a 100644 --- a/src/templates/qquickpressandholdhelper.cpp +++ b/src/templates/qquickpressandholdhelper.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickpressandholdhelper_p.h b/src/templates/qquickpressandholdhelper_p.h index 0ac84494..b58df9f0 100644 --- a/src/templates/qquickpressandholdhelper_p.h +++ b/src/templates/qquickpressandholdhelper_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp index aa0ed017..5ce7894b 100644 --- a/src/templates/qquickprogressbar.cpp +++ b/src/templates/qquickprogressbar.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickprogressbar_p.h b/src/templates/qquickprogressbar_p.h index 4c81c845..03b2d6a1 100644 --- a/src/templates/qquickprogressbar_p.h +++ b/src/templates/qquickprogressbar_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE class QQuickProgressBarPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickProgressBar : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickProgressBar : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) diff --git a/src/templates/qquickradiobutton.cpp b/src/templates/qquickradiobutton.cpp index 6681c69c..6a2ca887 100644 --- a/src/templates/qquickradiobutton.cpp +++ b/src/templates/qquickradiobutton.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickradiobutton_p.h b/src/templates/qquickradiobutton_p.h index 7601925f..bcff6225 100644 --- a/src/templates/qquickradiobutton_p.h +++ b/src/templates/qquickradiobutton_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,11 +48,11 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcheckable_p.h> +#include <QtLabsTemplates/private/qquickcheckable_p.h> QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES_EXPORT QQuickRadioButton : public QQuickCheckable +class Q_LABSTEMPLATES_EXPORT QQuickRadioButton : public QQuickCheckable { Q_OBJECT diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp index 3af734a5..8f194911 100644 --- a/src/templates/qquickscrollbar.cpp +++ b/src/templates/qquickscrollbar.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickscrollbar_p.h b/src/templates/qquickscrollbar_p.h index 4c723022..10cb470b 100644 --- a/src/templates/qquickscrollbar_p.h +++ b/src/templates/qquickscrollbar_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE @@ -56,7 +56,7 @@ class QQuickFlickable; class QQuickScrollBarAttached; class QQuickScrollBarPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickScrollBar : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickScrollBar : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL) @@ -114,7 +114,7 @@ Q_DECLARE_TYPEINFO(QQuickScrollBar, Q_COMPLEX_TYPE); class QQuickScrollBarAttachedPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickScrollBarAttached : public QObject +class Q_LABSTEMPLATES_EXPORT QQuickScrollBarAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickScrollBar *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL) diff --git a/src/templates/qquickscrollindicator.cpp b/src/templates/qquickscrollindicator.cpp index aec0b1c0..201513c1 100644 --- a/src/templates/qquickscrollindicator.cpp +++ b/src/templates/qquickscrollindicator.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickscrollindicator_p.h b/src/templates/qquickscrollindicator_p.h index 3e1f4e47..752e7d4f 100644 --- a/src/templates/qquickscrollindicator_p.h +++ b/src/templates/qquickscrollindicator_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE @@ -56,7 +56,7 @@ class QQuickFlickable; class QQuickScrollIndicatorAttached; class QQuickScrollIndicatorPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickScrollIndicator : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickScrollIndicator : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL) @@ -102,7 +102,7 @@ Q_DECLARE_TYPEINFO(QQuickScrollIndicator, Q_COMPLEX_TYPE); class QQuickScrollIndicatorAttachedPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickScrollIndicatorAttached : public QObject +class Q_LABSTEMPLATES_EXPORT QQuickScrollIndicatorAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickScrollIndicator *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL) diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp index 417bc1a1..ecd8a4ea 100644 --- a/src/templates/qquickslider.cpp +++ b/src/templates/qquickslider.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickslider_p.h b/src/templates/qquickslider_p.h index b6743156..4cafbfda 100644 --- a/src/templates/qquickslider_p.h +++ b/src/templates/qquickslider_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE class QQuickSliderPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickSlider : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickSlider : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp index 4919ae70..2e7def03 100644 --- a/src/templates/qquickstackview.cpp +++ b/src/templates/qquickstackview.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickstackview_p.cpp b/src/templates/qquickstackview_p.cpp index 810e94aa..498cc44c 100644 --- a/src/templates/qquickstackview_p.cpp +++ b/src/templates/qquickstackview_p.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickstackview_p.h b/src/templates/qquickstackview_p.h index df72f5d8..a530738a 100644 --- a/src/templates/qquickstackview_p.h +++ b/src/templates/qquickstackview_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ class QQuickStackElement; class QQuickStackAttached; class QQuickStackViewPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickStackView : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickStackView : public QQuickControl { Q_OBJECT Q_PROPERTY(bool busy READ busy NOTIFY busyChanged FINAL) @@ -148,7 +148,7 @@ Q_DECLARE_TYPEINFO(QQuickStackView, Q_COMPLEX_TYPE); class QQuickStackAttachedPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickStackAttached : public QObject +class Q_LABSTEMPLATES_EXPORT QQuickStackAttached : public QObject { Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) diff --git a/src/templates/qquickstackview_p_p.h b/src/templates/qquickstackview_p_p.h index 237a8ac4..39a57a5d 100644 --- a/src/templates/qquickstackview_p_p.h +++ b/src/templates/qquickstackview_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,8 +48,8 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickstackview_p.h> -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickstackview_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> #include <QtQuick/private/qquickitemviewtransition_p.h> #include <QtQuick/private/qquickitemchangelistener_p.h> #include <QtQml/private/qv4persistent_p.h> diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp index c0def1c8..29fdb849 100644 --- a/src/templates/qquickswipeview.cpp +++ b/src/templates/qquickswipeview.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -36,7 +36,7 @@ #include "qquickswipeview_p.h" -#include <QtQuickTemplates/private/qquickcontainer_p_p.h> +#include <QtLabsTemplates/private/qquickcontainer_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/templates/qquickswipeview_p.h b/src/templates/qquickswipeview_p.h index 19eceafc..24bd6972 100644 --- a/src/templates/qquickswipeview_p.h +++ b/src/templates/qquickswipeview_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,14 +48,14 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontainer_p.h> +#include <QtLabsTemplates/private/qquickcontainer_p.h> QT_BEGIN_NAMESPACE class QQuickSwipeViewAttached; class QQuickSwipeViewPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickSwipeView : public QQuickContainer +class Q_LABSTEMPLATES_EXPORT QQuickSwipeView : public QQuickContainer { Q_OBJECT @@ -77,7 +77,7 @@ private: class QQuickSwipeViewAttachedPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickSwipeViewAttached : public QObject +class Q_LABSTEMPLATES_EXPORT QQuickSwipeViewAttached : public QObject { Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) diff --git a/src/templates/qquickswitch.cpp b/src/templates/qquickswitch.cpp index 8d77b3df..0ce43dc7 100644 --- a/src/templates/qquickswitch.cpp +++ b/src/templates/qquickswitch.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquickswitch_p.h b/src/templates/qquickswitch_p.h index 5b3cbcf2..bb831bfb 100644 --- a/src/templates/qquickswitch_p.h +++ b/src/templates/qquickswitch_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcheckable_p.h> +#include <QtLabsTemplates/private/qquickcheckable_p.h> QT_BEGIN_NAMESPACE class QQuickSwitchPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickSwitch : public QQuickCheckable +class Q_LABSTEMPLATES_EXPORT QQuickSwitch : public QQuickCheckable { Q_OBJECT Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL) diff --git a/src/templates/qquicktabbar.cpp b/src/templates/qquicktabbar.cpp index a468ea4f..c07aa919 100644 --- a/src/templates/qquicktabbar.cpp +++ b/src/templates/qquicktabbar.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquicktabbar_p.h b/src/templates/qquicktabbar_p.h index 8a35d444..e711d10f 100644 --- a/src/templates/qquicktabbar_p.h +++ b/src/templates/qquicktabbar_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,13 +48,13 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcontainer_p.h> +#include <QtLabsTemplates/private/qquickcontainer_p.h> QT_BEGIN_NAMESPACE class QQuickTabBarPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickTabBar : public QQuickContainer +class Q_LABSTEMPLATES_EXPORT QQuickTabBar : public QQuickContainer { Q_OBJECT diff --git a/src/templates/qquicktabbutton.cpp b/src/templates/qquicktabbutton.cpp index ce88c7ab..0dc02b83 100644 --- a/src/templates/qquicktabbutton.cpp +++ b/src/templates/qquicktabbutton.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquicktabbutton_p.h b/src/templates/qquicktabbutton_p.h index 51b00835..b4075749 100644 --- a/src/templates/qquicktabbutton_p.h +++ b/src/templates/qquicktabbutton_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,11 +48,11 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickcheckable_p.h> +#include <QtLabsTemplates/private/qquickcheckable_p.h> QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES_EXPORT QQuickTabButton : public QQuickCheckable +class Q_LABSTEMPLATES_EXPORT QQuickTabButton : public QQuickCheckable { Q_OBJECT diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp index 3bcb0080..4063260e 100644 --- a/src/templates/qquicktextarea.cpp +++ b/src/templates/qquicktextarea.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquicktextarea_p.h b/src/templates/qquicktextarea_p.h index 78a51b6f..c565dad5 100644 --- a/src/templates/qquicktextarea_p.h +++ b/src/templates/qquicktextarea_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -49,7 +49,7 @@ // #include <QtQuick/private/qquicktextedit_p.h> -#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h> +#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> QT_BEGIN_NAMESPACE @@ -57,7 +57,7 @@ class QQuickText; class QQuickTextAreaPrivate; class QQuickMouseEvent; -class Q_QUICKTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit +class Q_LABSTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override diff --git a/src/templates/qquicktextarea_p_p.h b/src/templates/qquicktextarea_p_p.h index cd6a4630..533af771 100644 --- a/src/templates/qquicktextarea_p_p.h +++ b/src/templates/qquicktextarea_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -49,7 +49,7 @@ // #include <QtQuick/private/qquicktextedit_p_p.h> -#include <QtQuickTemplates/private/qquickpressandholdhelper_p.h> +#include <QtLabsTemplates/private/qquickpressandholdhelper_p.h> #include "qquicktextarea_p.h" diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp index 02ebfc25..a16b3c14 100644 --- a/src/templates/qquicktextfield.cpp +++ b/src/templates/qquicktextfield.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquicktextfield_p.h b/src/templates/qquicktextfield_p.h index 400f0334..ab6bfa52 100644 --- a/src/templates/qquicktextfield_p.h +++ b/src/templates/qquicktextfield_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -49,7 +49,7 @@ // #include <QtQuick/private/qquicktextinput_p.h> -#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h> +#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h> QT_BEGIN_NAMESPACE @@ -57,7 +57,7 @@ class QQuickText; class QQuickTextFieldPrivate; class QQuickMouseEvent; -class Q_QUICKTEMPLATES_EXPORT QQuickTextField : public QQuickTextInput +class Q_LABSTEMPLATES_EXPORT QQuickTextField : public QQuickTextInput { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override diff --git a/src/templates/qquicktextfield_p_p.h b/src/templates/qquicktextfield_p_p.h index 823a0bbd..c75294a7 100644 --- a/src/templates/qquicktextfield_p_p.h +++ b/src/templates/qquicktextfield_p_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -49,7 +49,7 @@ // #include <QtQuick/private/qquicktextinput_p_p.h> -#include <QtQuickTemplates/private/qquickpressandholdhelper_p.h> +#include <QtLabsTemplates/private/qquickpressandholdhelper_p.h> #include "qquicktextfield_p.h" diff --git a/src/templates/qquicktoolbar.cpp b/src/templates/qquicktoolbar.cpp index f9141b25..7fdc98ae 100644 --- a/src/templates/qquicktoolbar.cpp +++ b/src/templates/qquicktoolbar.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquicktoolbar_p.h b/src/templates/qquicktoolbar_p.h index 80204e5b..d45106ee 100644 --- a/src/templates/qquicktoolbar_p.h +++ b/src/templates/qquicktoolbar_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,11 +48,11 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickframe_p.h> +#include <QtLabsTemplates/private/qquickframe_p.h> QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES_EXPORT QQuickToolBar : public QQuickFrame +class Q_LABSTEMPLATES_EXPORT QQuickToolBar : public QQuickFrame { Q_OBJECT diff --git a/src/templates/qquicktoolbutton.cpp b/src/templates/qquicktoolbutton.cpp index b913494e..a26d9c7b 100644 --- a/src/templates/qquicktoolbutton.cpp +++ b/src/templates/qquicktoolbutton.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/templates/qquicktoolbutton_p.h b/src/templates/qquicktoolbutton_p.h index 25ef6639..e0e7892d 100644 --- a/src/templates/qquicktoolbutton_p.h +++ b/src/templates/qquicktoolbutton_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -48,11 +48,11 @@ // We mean it. // -#include <QtQuickTemplates/private/qquickbutton_p.h> +#include <QtLabsTemplates/private/qquickbutton_p.h> QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES_EXPORT QQuickToolButton : public QQuickButton +class Q_LABSTEMPLATES_EXPORT QQuickToolButton : public QQuickButton { Q_OBJECT diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp index 73358b75..38664cbd 100644 --- a/src/templates/qquicktumbler.cpp +++ b/src/templates/qquicktumbler.cpp @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -37,7 +37,7 @@ #include "qquicktumbler_p.h" #include <QtQuick/private/qquickflickable_p.h> -#include <QtQuickTemplates/private/qquickcontrol_p_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p_p.h> QT_BEGIN_NAMESPACE diff --git a/src/templates/qquicktumbler_p.h b/src/templates/qquicktumbler_p.h index ff8d2b4a..079cdbb3 100644 --- a/src/templates/qquicktumbler_p.h +++ b/src/templates/qquicktumbler_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -50,14 +50,14 @@ #include <QtCore/qvariant.h> #include <QtQml/qqmlcomponent.h> -#include <QtQuickTemplates/private/qquickcontrol_p.h> +#include <QtLabsTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE class QQuickTumblerAttached; class QQuickTumblerPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickTumbler : public QQuickControl +class Q_LABSTEMPLATES_EXPORT QQuickTumbler : public QQuickControl { Q_OBJECT Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged FINAL) @@ -114,7 +114,7 @@ Q_DECLARE_TYPEINFO(QQuickTumbler, Q_COMPLEX_TYPE); class QQuickTumblerAttachedPrivate; -class Q_QUICKTEMPLATES_EXPORT QQuickTumblerAttached : public QObject +class Q_LABSTEMPLATES_EXPORT QQuickTumblerAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT) diff --git a/src/templates/qtquicktemplatesglobal_p.h b/src/templates/qtlabstemplatesglobal_p.h index f39af6e1..432240e2 100644 --- a/src/templates/qtquicktemplatesglobal_p.h +++ b/src/templates/qtlabstemplatesglobal_p.h @@ -3,7 +3,7 @@ ** 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. +** This file is part of the Qt Labs Templates module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QTQUICKTEMPLATESGLOBAL_P_H -#define QTQUICKTEMPLATESGLOBAL_P_H +#ifndef QTLABSTEMPLATESGLOBAL_P_H +#define QTLABSTEMPLATESGLOBAL_P_H // // W A R N I N G @@ -53,15 +53,15 @@ QT_BEGIN_NAMESPACE #ifndef QT_STATIC -# if defined(QT_BUILD_QUICKTEMPLATES_LIB) -# define Q_QUICKTEMPLATES_EXPORT Q_DECL_EXPORT +# if defined(QT_BUILD_LABSTEMPLATES_LIB) +# define Q_LABSTEMPLATES_EXPORT Q_DECL_EXPORT # else -# define Q_QUICKTEMPLATES_EXPORT Q_DECL_IMPORT +# define Q_LABSTEMPLATES_EXPORT Q_DECL_IMPORT # endif #else -# define Q_QUICKTEMPLATES_EXPORT +# define Q_LABSTEMPLATES_EXPORT #endif QT_END_NAMESPACE -#endif // QTQUICKTEMPLATESGLOBAL_P_H +#endif // QTLABSTEMPLATESGLOBAL_P_H diff --git a/src/templates/templates.pro b/src/templates/templates.pro index 51630961..72c16b79 100644 --- a/src/templates/templates.pro +++ b/src/templates/templates.pro @@ -1,5 +1,5 @@ -TARGET = QtQuickTemplates -MODULE = quicktemplates +TARGET = QtLabsTemplates +MODULE = labstemplates CONFIG += internal_module QT += quick @@ -8,7 +8,7 @@ QT += core-private gui-private qml-private quick-private DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII HEADERS += \ - $$PWD/qtquicktemplatesglobal_p.h + $$PWD/qtlabstemplatesglobal_p.h include(templates.pri) load(qt_module) diff --git a/sync.profile b/sync.profile index a365aca9..904a3a62 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,5 @@ %modules = ( # path to module name map - "QtQuickTemplates" => "$basedir/src/templates", + "QtLabsTemplates" => "$basedir/src/templates", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 0a57847b..8a9caa4d 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 54e21690..50a203c3 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml index 094f8c6e..2eba2afc 100644 --- a/tests/auto/controls/data/tst_scrollindicator.qml +++ b/tests/auto/controls/data/tst_scrollindicator.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index f39676a4..dc56830a 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml index 40e7dfa0..ceb316d4 100644 --- a/tests/auto/controls/data/tst_swipeview.qml +++ b/tests/auto/controls/data/tst_swipeview.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml index 97430681..3a8937bb 100644 --- a/tests/auto/controls/data/tst_tumbler.qml +++ b/tests/auto/controls/data/tst_tumbler.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtTest 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T TestCase { id: testCase diff --git a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml index 3874ea44..d096019f 100644 --- a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml +++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml @@ -1,7 +1,7 @@ import QtQuick 2.0 import Qt.labs.calendar 1.0 import QtQuick.Controls 2.0 -import QtQuick.Templates 2.0 as T +import Qt.labs.templates 1.0 as T //! [1] ListView { diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml index 978435c0..1654e93c 100644 --- a/tests/manual/fonts/main.qml +++ b/tests/manual/fonts/main.qml @@ -40,7 +40,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 import QtQuick.Layouts 1.2 ApplicationWindow { diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml index 465c055f..985c64c4 100644 --- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml +++ b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml @@ -40,7 +40,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 Item { width: 200 |