qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Qt Labs Controls to Qt Quick Controls 2 - build system 

The imports will be done later, as we don't want to change them until
the module is releasable (which requires things like selection handles,
etc.).

Change-Id: I2140cff7058fc3b696e92ca8c0e5e06dca9a7c9c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
This commit is contained in:
Mitch Curtis 2016-03-16 16:37:02 +01:00
parent 3b73180ca0
commit a0d44a1653
103 changed files with 266 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/controls/gallery/gallery.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = gallery
QT += quick labscontrols
QT += quick quickcontrols
SOURCES += \
gallery.cpp

10
src/controls/controls.pro
View File

@ -1,14 +1,14 @@
TARGET = QtLabsControls
MODULE = labscontrols
TARGET = QtQuickControls
MODULE = quickcontrols
QT += quick
QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
HEADERS += \
$$PWD/qtlabscontrolsglobal.h
$$PWD/qtlabscontrolsglobal_p.h
$$PWD/qtquickcontrolsglobal.h
$$PWD/qtquickcontrolsglobal_p.h
include(controls.pri)
load(qt_module)

4
src/controls/qquickcolorimageprovider_p.h
View File

@ -49,11 +49,11 @@
//
#include <QtQuick/qquickimageprovider.h>
#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
QT_BEGIN_NAMESPACE
class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickColorImageProvider : public QQuickImageProvider
class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickColorImageProvider : public QQuickImageProvider
{
public:
QQuickColorImageProvider(const QString &path);

4
src/controls/qquickpaddedrectangle_p.h
View File

@ -49,11 +49,11 @@
//
#include <QtQuick/private/qquickrectangle_p.h>
#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
QT_BEGIN_NAMESPACE
class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickPaddedRectangle : public QQuickRectangle
class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickPaddedRectangle : public QQuickRectangle
{
Q_OBJECT
Q_PROPERTY(qreal padding READ padding WRITE setPadding RESET resetPadding NOTIFY paddingChanged FINAL)

4
src/controls/qquickproxytheme_p.h
View File

@ -49,11 +49,11 @@
//
#include <QtGui/qpa/qplatformtheme.h>
#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
QT_BEGIN_NAMESPACE
class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickProxyTheme : public QPlatformTheme
class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickProxyTheme : public QPlatformTheme
{
public:
QQuickProxyTheme(QPlatformTheme *theme);

4
src/controls/qquickstyle.h
View File

@ -39,11 +39,11 @@
#include <QtCore/qurl.h>
#include <QtCore/qstring.h>
#include <QtLabsControls/qtlabscontrolsglobal.h>
#include <QtQuickControls/qtquickcontrolsglobal.h>
QT_BEGIN_NAMESPACE
class Q_LABSCONTROLS_EXPORT QQuickStyle
class Q_QUICKCONTROLS_EXPORT QQuickStyle
{
public:
static QString name();

2
src/controls/qquickstyleattached.cpp
View File

@ -40,7 +40,7 @@
#include <QtCore/qsettings.h>
#include <QtCore/qfileselector.h>
#include <QtQuick/private/qquickitem_p.h>
#include <QtLabsTemplates/private/qquickpopup_p.h>
#include <QtQuickTemplates/private/qquickpopup_p.h>
QT_BEGIN_NAMESPACE

4
src/controls/qquickstyleattached_p.h
View File

@ -54,13 +54,13 @@
#include <QtCore/qpointer.h>
#include <QtCore/qsharedpointer.h>
#include <QtQuick/private/qquickitemchangelistener_p.h>
#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
QT_BEGIN_NAMESPACE
class QSettings;
class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener
class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickStyleAttached : public QObject, public QQuickItemChangeListener
{
Q_OBJECT

4
src/controls/qquickstyleselector_p.h
View File

@ -48,13 +48,13 @@
#include <QtCore/qurl.h>
#include <QtCore/qscopedpointer.h>
#include <QtLabsControls/private/qtlabscontrolsglobal_p.h>
#include <QtQuickControls/private/qtquickcontrolsglobal_p.h>
QT_BEGIN_NAMESPACE
class QQuickStyleSelectorPrivate;
class Q_LABSCONTROLS_PRIVATE_EXPORT QQuickStyleSelector
class Q_QUICKCONTROLS_PRIVATE_EXPORT QQuickStyleSelector
{
public:
explicit QQuickStyleSelector();

14
src/controls/qtlabscontrolsglobal.h → src/controls/qtquickcontrolsglobal.h
View File

@ -34,23 +34,23 @@
**
****************************************************************************/
#ifndef QTLABSCONTROLSSGLOBAL_H
#define QTLABSCONTROLSSGLOBAL_H
#ifndef QTQUICKCONTROLSGLOBAL_H
#define QTQUICKCONTROLSGLOBAL_H
#include <QtCore/qglobal.h>
QT_BEGIN_NAMESPACE
#ifndef QT_STATIC
# if defined(QT_BUILD_LABSCONTROLS_LIB)
# define Q_LABSCONTROLS_EXPORT Q_DECL_EXPORT
# if defined(QT_BUILD_QUICKCONTROLS_LIB)
# define Q_QUICKCONTROLS_EXPORT Q_DECL_EXPORT
# else
# define Q_LABSCONTROLS_EXPORT Q_DECL_IMPORT
# define Q_QUICKCONTROLS_EXPORT Q_DECL_IMPORT
# endif
#else
# define Q_LABSCONTROLS_EXPORT
# define Q_QUICKCONTROLS_EXPORT
#endif
QT_END_NAMESPACE
#endif // QTLABSCONTROLSSGLOBAL_H
#endif // QTQUICKCONTROLSGLOBAL_H

10
src/controls/qtlabscontrolsglobal_p.h → src/controls/qtquickcontrolsglobal_p.h
View File

@ -34,8 +34,8 @@
**
****************************************************************************/
#ifndef QTLABSCONTROLSSGLOBAL_P_H
#define QTLABSCONTROLSSGLOBAL_P_H
#ifndef QTQUICKCONTROLSGLOBAL_P_H
#define QTQUICKCONTROLSGLOBAL_P_H
//
// W A R N I N G
@ -48,8 +48,8 @@
// We mean it.
//
#include <QtLabsControls/qtlabscontrolsglobal.h>
#include <QtQuickControls/qtquickcontrolsglobal.h>
#define Q_LABSCONTROLS_PRIVATE_EXPORT Q_LABSCONTROLS_EXPORT
#define Q_QUICKCONTROLS_PRIVATE_EXPORT Q_QUICKCONTROLS_EXPORT
#endif // QTLABSCONTROLSSGLOBAL_P_H
#endif // QTQUICKCONTROLSGLOBAL_P_H

2
src/imports/calendar/calendar.pro
View File

@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/calendar
IMPORT_VERSION = 1.0
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII

2
src/imports/calendar/qquickdayofweekrow.cpp
View File

@ -37,7 +37,7 @@
#include "qquickdayofweekrow_p.h"
#include "qquickdayofweekmodel_p.h"
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
QT_BEGIN_NAMESPACE

2
src/imports/calendar/qquickdayofweekrow_p.h
View File

@ -48,7 +48,7 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE

2
src/imports/calendar/qquickmonthgrid.cpp
View File

@ -39,7 +39,7 @@
#include <QtGui/qstylehints.h>
#include <QtGui/qguiapplication.h>
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
#include <QtQml/qqmlinfo.h>
QT_BEGIN_NAMESPACE

2
src/imports/calendar/qquickmonthgrid_p.h
View File

@ -48,7 +48,7 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE

2
src/imports/calendar/qquickweeknumbercolumn.cpp
View File

@ -37,7 +37,7 @@
#include "qquickweeknumbercolumn_p.h"
#include "qquickweeknumbermodel_p.h"
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
#include <QtQml/qqmlinfo.h>
QT_BEGIN_NAMESPACE

2
src/imports/calendar/qquickweeknumbercolumn_p.h
View File

@ -48,7 +48,7 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE

8
src/imports/controls/controls.pro
View File

@ -1,9 +1,9 @@
TARGET = qtlabscontrolsplugin
TARGET = qtquickcontrolsplugin
TARGETPATH = Qt/labs/controls
IMPORT_VERSION = 1.0
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
@ -17,12 +17,12 @@ HEADERS += \
$$PWD/qquickprogressstrip_p.h
SOURCES += \
$$PWD/qtlabscontrolsplugin.cpp \
$$PWD/qtquickcontrolsplugin.cpp \
$$PWD/qquickbusyindicatorring.cpp \
$$PWD/qquickprogressstrip.cpp
RESOURCES += \
$$PWD/qtlabscontrolsplugin.qrc
$$PWD/qtquickcontrolsplugin.qrc
include(controls.pri)
!static: include(designer/designer.pri)

2
src/imports/controls/material/material.pro
View File

@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls/material
IMPORT_VERSION = 1.0
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII

2
src/imports/controls/material/qquickmaterialstyle.cpp
View File

@ -39,7 +39,7 @@
#include <QtCore/qdebug.h>
#include <QtCore/qsettings.h>
#include <QtQml/qqmlinfo.h>
#include <QtLabsControls/private/qquickstyleattached_p.h>
#include <QtQuickControls/private/qquickstyleattached_p.h>
QT_BEGIN_NAMESPACE

2
src/imports/controls/material/qquickmaterialstyle_p.h
View File

@ -49,7 +49,7 @@
//
#include <QtGui/qcolor.h>
#include <QtLabsControls/private/qquickstyleattached_p.h>
#include <QtQuickControls/private/qquickstyleattached_p.h>
QT_BEGIN_NAMESPACE

2
src/imports/controls/material/qquickmaterialtheme_p.h
View File

@ -50,7 +50,7 @@
#include <QtGui/qpa/qplatformtheme.h>
#include <QtGui/qfont.h>
#include <QtLabsControls/private/qquickproxytheme_p.h>
#include <QtQuickControls/private/qquickproxytheme_p.h>
QT_BEGIN_NAMESPACE

3
src/imports/controls/material/qtlabsmaterialstyleplugin.cpp
View File

@ -42,7 +42,8 @@
#include "qquickmaterialprogressstrip_p.h"
#include <QtGui/private/qguiapplication_p.h>
#include <QtLabsControls/qquickstyle.h>
#include <QtQuickControls/qquickstyle.h>
#include <QtQuickControls/private/qquickstyleselector_p.h>
static inline void initResources()
{

4
src/imports/controls/qmldir
View File

@ -1,5 +1,5 @@
module Qt.labs.controls
plugin qtlabscontrolsplugin
classname QtLabsControlsPlugin
plugin qtquickcontrolsplugin
classname QtQuickControlsPlugin
depends Qt.labs.templates 1.0
designersupported

30
src/imports/controls/qtlabscontrolsplugin.cpp → src/imports/controls/qtquickcontrolsplugin.cpp
View File

@ -40,44 +40,44 @@
#include <QtCore/qcoreapplication.h>
#include <QtCore/private/qfileselector_p.h>
#include <QtLabsControls/qquickstyle.h>
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtLabsTemplates/private/qquickbuttongroup_p.h>
#include <QtLabsTemplates/private/qquickcontainer_p.h>
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtLabsTemplates/private/qquickpopup_p.h>
#include <QtLabsControls/private/qquickstyleselector_p.h>
#include <QtQuickControls/qquickstyle.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickbuttongroup_p.h>
#include <QtQuickTemplates/private/qquickcontainer_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickpopup_p.h>
#include <QtQuickControls/private/qquickstyleselector_p.h>
#include "qquickbusyindicatorring_p.h"
#include "qquickprogressstrip_p.h"
static inline void initResources()
{
Q_INIT_RESOURCE(qtlabscontrolsplugin);
Q_INIT_RESOURCE(qtquickcontrolsplugin);
#ifdef QT_STATIC
Q_INIT_RESOURCE(qmake_Qt_labs_controls);
Q_INIT_RESOURCE(qmake_Qt_quick_controls);
#endif
}
QT_BEGIN_NAMESPACE
class QtLabsControlsPlugin: public QQmlExtensionPlugin
class QtQuickControlsPlugin: public QQmlExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
QtLabsControlsPlugin(QObject *parent = nullptr);
QtQuickControlsPlugin(QObject *parent = nullptr);
void registerTypes(const char *uri);
void initializeEngine(QQmlEngine *engine, const char *uri);
};
QtLabsControlsPlugin::QtLabsControlsPlugin(QObject *parent) : QQmlExtensionPlugin(parent)
QtQuickControlsPlugin::QtQuickControlsPlugin(QObject *parent) : QQmlExtensionPlugin(parent)
{
initResources();
}
void QtLabsControlsPlugin::registerTypes(const char *uri)
void QtQuickControlsPlugin::registerTypes(const char *uri)
{
qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton");
qmlRegisterType<QQuickButtonGroup>(uri, 1, 0, "ButtonGroup");
@ -132,7 +132,7 @@ void QtLabsControlsPlugin::registerTypes(const char *uri)
qmlRegisterType(selector.select(QStringLiteral("Tumbler.qml")), uri, 1, 0, "Tumbler");
}
void QtLabsControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
void QtQuickControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
{
Q_UNUSED(engine);
Q_UNUSED(uri);
@ -146,4 +146,4 @@ void QtLabsControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
QT_END_NAMESPACE
#include "qtlabscontrolsplugin.moc"
#include "qtquickcontrolsplugin.moc"

0
src/imports/controls/qtlabscontrolsplugin.qrc → src/imports/controls/qtquickcontrolsplugin.qrc
View File

2
src/imports/controls/universal/qquickuniversalstyle.cpp
View File

@ -39,7 +39,7 @@
#include <QtCore/qdebug.h>
#include <QtCore/qsettings.h>
#include <QtQml/qqmlinfo.h>
#include <QtLabsControls/private/qquickstyleattached_p.h>
#include <QtQuickControls/private/qquickstyleattached_p.h>
QT_BEGIN_NAMESPACE

2
src/imports/controls/universal/qquickuniversalstyle_p.h
View File

@ -49,7 +49,7 @@
//
#include <QtGui/qcolor.h>
#include <QtLabsControls/private/qquickstyleattached_p.h>
#include <QtQuickControls/private/qquickstyleattached_p.h>
QT_BEGIN_NAMESPACE

2
src/imports/controls/universal/qquickuniversaltheme_p.h
View File

@ -50,7 +50,7 @@
#include <QtGui/qpa/qplatformtheme.h>
#include <QtGui/qfont.h>
#include <QtLabsControls/private/qquickproxytheme_p.h>
#include <QtQuickControls/private/qquickproxytheme_p.h>
QT_BEGIN_NAMESPACE

4
src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp
View File

@ -42,8 +42,8 @@
#include "qquickuniversaltheme_p.h"
#include <QtGui/private/qguiapplication_p.h>
#include <QtLabsControls/private/qquickcolorimageprovider_p.h>
#include <QtLabsControls/qquickstyle.h>
#include <QtQuickControls/private/qquickcolorimageprovider_p.h>
#include <QtQuickControls/qquickstyle.h>
static inline void initResources()
{

2
src/imports/controls/universal/universal.pro
View File

@ -3,7 +3,7 @@ TARGETPATH = Qt/labs/controls/universal
IMPORT_VERSION = 1.0
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII

4
src/imports/templates/qmldir
View File

@ -1,4 +1,4 @@
module Qt.labs.templates
plugin qtlabstemplatesplugin
classname QtLabsTemplatesPlugin
plugin qtquicktemplatesplugin
classname QtQuickTemplatesPlugin
depends QtQuick.Window 2.2

90
src/imports/templates/qtlabstemplatesplugin.cpp → src/imports/templates/qtquicktemplatesplugin.cpp
View File

@ -36,71 +36,71 @@
#include <QtQml/qqmlextensionplugin.h>
#include <QtLabsTemplates/private/qquickabstractbutton_p.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/qquickcombobox_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/qquickitemdelegate_p.h>
#include <QtLabsTemplates/private/qquicklabel_p.h>
#include <QtLabsTemplates/private/qquickmenu_p.h>
#include <QtLabsTemplates/private/qquickmenuitem_p.h>
#include <QtLabsTemplates/private/qquickoverlay_p.h>
#include <QtLabsTemplates/private/qquickpage_p.h>
#include <QtLabsTemplates/private/qquickpageindicator_p.h>
#include <QtLabsTemplates/private/qquickpane_p.h>
#include <QtLabsTemplates/private/qquickpopup_p.h>
#include <QtLabsTemplates/private/qquickprogressbar_p.h>
#include <QtLabsTemplates/private/qquickradiobutton_p.h>
#include <QtLabsTemplates/private/qquickrangeslider_p.h>
#include <QtLabsTemplates/private/qquickscrollbar_p.h>
#include <QtLabsTemplates/private/qquickscrollindicator_p.h>
#include <QtLabsTemplates/private/qquickslider_p.h>
#include <QtLabsTemplates/private/qquickspinbox_p.h>
#include <QtLabsTemplates/private/qquickstackview_p.h>
#include <QtLabsTemplates/private/qquickswipedelegate_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>
#include <QtQuickTemplates/private/qquickabstractbutton_p.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/qquickcombobox_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/qquickitemdelegate_p.h>
#include <QtQuickTemplates/private/qquicklabel_p.h>
#include <QtQuickTemplates/private/qquickmenu_p.h>
#include <QtQuickTemplates/private/qquickmenuitem_p.h>
#include <QtQuickTemplates/private/qquickoverlay_p.h>
#include <QtQuickTemplates/private/qquickpage_p.h>
#include <QtQuickTemplates/private/qquickpageindicator_p.h>
#include <QtQuickTemplates/private/qquickpane_p.h>
#include <QtQuickTemplates/private/qquickpopup_p.h>
#include <QtQuickTemplates/private/qquickprogressbar_p.h>
#include <QtQuickTemplates/private/qquickradiobutton_p.h>
#include <QtQuickTemplates/private/qquickrangeslider_p.h>
#include <QtQuickTemplates/private/qquickscrollbar_p.h>
#include <QtQuickTemplates/private/qquickscrollindicator_p.h>
#include <QtQuickTemplates/private/qquickslider_p.h>
#include <QtQuickTemplates/private/qquickspinbox_p.h>
#include <QtQuickTemplates/private/qquickstackview_p.h>
#include <QtQuickTemplates/private/qquickswipedelegate_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>
static inline void initResources()
{
#ifdef QT_STATIC
Q_INIT_RESOURCE(qmake_Qt_labs_templates);
Q_INIT_RESOURCE(qmake_Qt_quick_templates);
#endif
}
QT_BEGIN_NAMESPACE
class QtLabsTemplatesPlugin: public QQmlExtensionPlugin
class QtQuickTemplatesPlugin: public QQmlExtensionPlugin
{
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
QtLabsTemplatesPlugin(QObject *parent = nullptr);
QtQuickTemplatesPlugin(QObject *parent = nullptr);
void registerTypes(const char *uri);
};
QtLabsTemplatesPlugin::QtLabsTemplatesPlugin(QObject *parent) : QQmlExtensionPlugin(parent)
QtQuickTemplatesPlugin::QtQuickTemplatesPlugin(QObject *parent) : QQmlExtensionPlugin(parent)
{
initResources();
}
void QtLabsTemplatesPlugin::registerTypes(const char *uri)
void QtQuickTemplatesPlugin::registerTypes(const char *uri)
{
qmlRegisterType<QQuickAbstractButton>(uri, 1, 0, "AbstractButton");
qmlRegisterType<QQuickApplicationWindow>(uri, 1, 0, "ApplicationWindow");
@ -157,4 +157,4 @@ void QtLabsTemplatesPlugin::registerTypes(const char *uri)
QT_END_NAMESPACE
#include "qtlabstemplatesplugin.moc"
#include "qtquicktemplatesplugin.moc"

6
src/imports/templates/templates.pro
View File

@ -1,9 +1,9 @@
TARGET = qtlabstemplatesplugin
TARGET = qtquicktemplatesplugin
TARGETPATH = Qt/labs/templates
IMPORT_VERSION = 1.0
QT += qml quick
QT_PRIVATE += core-private gui-private qml-private quick-private labstemplates-private
QT_PRIVATE += core-private gui-private qml-private quick-private quicktemplates-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
@ -11,7 +11,7 @@ OTHER_FILES += \
qmldir
SOURCES += \
$$PWD/qtlabstemplatesplugin.cpp
$$PWD/qtquicktemplatesplugin.cpp
CONFIG += no_cxx_module
load(qml_plugin)

4
src/templates/qquickabstractbutton_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickAbstractButtonPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickAbstractButton : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)

4
src/templates/qquickabstractbutton_p_p.h
View File

@ -48,8 +48,8 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
QT_BEGIN_NAMESPACE

6
src/templates/qquickapplicationwindow_p.h
View File

@ -49,7 +49,7 @@
//
#include <QtQuick/private/qquickwindowmodule_p.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
#include <QtGui/qfont.h>
#include <QtCore/qlocale.h>
@ -60,7 +60,7 @@ class QQuickApplicationWindowPrivate;
class QQuickApplicationWindowAttached;
class QQuickApplicationWindowAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
class Q_QUICKTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
{
Q_OBJECT
Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
@ -125,7 +125,7 @@ private:
QScopedPointer<QQuickApplicationWindowPrivate> d_ptr;
};
class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindowAttached : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickApplicationWindowAttached : public QObject
{
Q_OBJECT
Q_PROPERTY(QQuickApplicationWindow *window READ window NOTIFY windowChanged FINAL)

4
src/templates/qquickbusyindicator_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickBusyIndicatorPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickBusyIndicator : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickBusyIndicator : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged FINAL)

4
src/templates/qquickbutton_p.h
View File

@ -48,11 +48,11 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class Q_LABSTEMPLATES_EXPORT QQuickButton : public QQuickAbstractButton
class Q_QUICKTEMPLATES_EXPORT QQuickButton : public QQuickAbstractButton
{
Q_OBJECT

6
src/templates/qquickbuttongroup_p.h
View File

@ -49,7 +49,7 @@
//
#include <QtCore/qobject.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
#include <QtQml/qqml.h>
QT_BEGIN_NAMESPACE
@ -59,7 +59,7 @@ class QQuickButtonGroupPrivate;
class QQuickButtonGroupAttached;
class QQuickButtonGroupAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickButtonGroup : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickButtonGroup : public QObject
{
Q_OBJECT
Q_PROPERTY(QQuickAbstractButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged)
@ -89,7 +89,7 @@ private:
Q_DECLARE_PRIVATE(QQuickButtonGroup)
};
class Q_LABSTEMPLATES_EXPORT QQuickButtonGroupAttached : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickButtonGroupAttached : public QObject
{
Q_OBJECT
Q_PROPERTY(QQuickButtonGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL)

4
src/templates/qquickcheckbox_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class QQuickCheckBoxPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickCheckBox : public QQuickAbstractButton
class Q_QUICKTEMPLATES_EXPORT QQuickCheckBox : public QQuickAbstractButton
{
Q_OBJECT
Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL)

4
src/templates/qquickcombobox_p.h
View File

@ -48,7 +48,7 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
@ -56,7 +56,7 @@ class QQuickPopup;
class QQmlInstanceModel;
class QQuickComboBoxPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickComboBox : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickComboBox : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)

4
src/templates/qquickcontainer_p.h
View File

@ -48,14 +48,14 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
#include <QtQml/qqmllist.h>
QT_BEGIN_NAMESPACE
class QQuickContainerPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickContainer : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickContainer : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)

4
src/templates/qquickcontainer_p_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
#include <QtQuick/private/qquickitemchangelistener_p.h>
#include <QtQml/private/qqmlobjectmodel_p.h>
QT_BEGIN_NAMESPACE
class Q_LABSTEMPLATES_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener
class Q_QUICKTEMPLATES_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener
{
Q_DECLARE_PUBLIC(QQuickContainer)

4
src/templates/qquickcontrol_p.h
View File

@ -50,13 +50,13 @@
#include <QtCore/qlocale.h>
#include <QtQuick/qquickitem.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
QT_BEGIN_NAMESPACE
class QQuickControlPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickControl : public QQuickItem
class Q_QUICKTEMPLATES_EXPORT QQuickControl : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL)

2
src/templates/qquickcontrol_p_p.h
View File

@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
class QQuickAccessibleAttached;
class Q_LABSTEMPLATES_EXPORT QQuickControlPrivate : public QQuickItemPrivate
class Q_QUICKTEMPLATES_EXPORT QQuickControlPrivate : public QQuickItemPrivate
#ifndef QT_NO_ACCESSIBILITY
, public QAccessible::ActivationObserver
#endif

2
src/templates/qquickdial.cpp
View File

@ -38,7 +38,7 @@
#include <QtCore/qmath.h>
#include <QtQuick/private/qquickflickable_p.h>
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
QT_BEGIN_NAMESPACE

4
src/templates/qquickdial_p.h
View File

@ -50,14 +50,14 @@
#include <QtCore/qvariant.h>
#include <QtQml/qqmlcomponent.h>
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickDialAttached;
class QQuickDialPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickDial : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickDial : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)

2
src/templates/qquickdrawer.cpp
View File

@ -41,7 +41,7 @@
#include <QtQuick/private/qquickwindow_p.h>
#include <QtQuick/private/qquickanimation_p.h>
#include <QtQuick/private/qquickitemchangelistener_p.h>
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
QT_BEGIN_NAMESPACE

4
src/templates/qquickdrawer_p.h
View File

@ -48,14 +48,14 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickPropertyAnimation;
class QQuickDrawerPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickDrawer : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickDrawer : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged FINAL)

4
src/templates/qquickframe_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickpane_p.h>
#include <QtQuickTemplates/private/qquickpane_p.h>
QT_BEGIN_NAMESPACE
class QQuickFramePrivate;
class Q_LABSTEMPLATES_EXPORT QQuickFrame : public QQuickPane
class Q_QUICKTEMPLATES_EXPORT QQuickFrame : public QQuickPane
{
Q_OBJECT

4
src/templates/qquickframe_p_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickpane_p_p.h>
#include <QtQuickTemplates/private/qquickpane_p_p.h>
QT_BEGIN_NAMESPACE
class QQuickFrame;
class Q_LABSTEMPLATES_EXPORT QQuickFramePrivate : public QQuickPanePrivate
class Q_QUICKTEMPLATES_EXPORT QQuickFramePrivate : public QQuickPanePrivate
{
};

4
src/templates/qquickgroupbox_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickframe_p.h>
#include <QtQuickTemplates/private/qquickframe_p.h>
QT_BEGIN_NAMESPACE
class QQuickGroupBoxPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickGroupBox : public QQuickFrame
class Q_QUICKTEMPLATES_EXPORT QQuickGroupBox : public QQuickFrame
{
Q_OBJECT
Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)

4
src/templates/qquickitemdelegate_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class QQuickItemDelegatePrivate;
class Q_LABSTEMPLATES_EXPORT QQuickItemDelegate : public QQuickAbstractButton
class Q_QUICKTEMPLATES_EXPORT QQuickItemDelegate : public QQuickAbstractButton
{
Q_OBJECT

4
src/templates/qquicklabel_p.h
View File

@ -49,13 +49,13 @@
//
#include <QtQuick/private/qquicktext_p.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
QT_BEGIN_NAMESPACE
class QQuickLabelPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickLabel : public QQuickText
class Q_QUICKTEMPLATES_EXPORT QQuickLabel : public QQuickText
{
Q_OBJECT
Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override

2
src/templates/qquickmenu_p.h
View File

@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
class QQuickMenuItem;
class QQuickMenuPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickMenu : public QQuickPopup
class Q_QUICKTEMPLATES_EXPORT QQuickMenu : public QQuickPopup
{
Q_OBJECT
Q_PROPERTY(QVariant contentModel READ contentModel CONSTANT FINAL)

4
src/templates/qquickmenu_p_p.h
View File

@ -52,13 +52,13 @@
#include <QtCore/qpointer.h>
#include <QtQuick/private/qquickitemchangelistener_p.h>
#include <QtLabsTemplates/private/qquickpopup_p_p.h>
#include <QtQuickTemplates/private/qquickpopup_p_p.h>
QT_BEGIN_NAMESPACE
class QQmlObjectModel;
class Q_LABSTEMPLATES_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate, public QQuickItemChangeListener
class Q_QUICKTEMPLATES_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate, public QQuickItemChangeListener
{
Q_DECLARE_PUBLIC(QQuickMenu)

4
src/templates/qquickmenuitem_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class QQuickMenuItemPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickMenuItem : public QQuickAbstractButton
class Q_QUICKTEMPLATES_EXPORT QQuickMenuItem : public QQuickAbstractButton
{
Q_OBJECT

4
src/templates/qquickoverlay_p.h
View File

@ -49,13 +49,13 @@
//
#include <QtQuick/qquickitem.h>
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class QQuickOverlayPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickOverlay : public QQuickItem
class Q_QUICKTEMPLATES_EXPORT QQuickOverlay : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)

4
src/templates/qquickpage_p.h
View File

@ -48,14 +48,14 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
#include <QtQml/qqmllist.h>
QT_BEGIN_NAMESPACE
class QQuickPagePrivate;
class Q_LABSTEMPLATES_EXPORT QQuickPage : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickPage : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL)

4
src/templates/qquickpageindicator_p.h
View File

@ -48,14 +48,14 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQmlComponent;
class QQuickPageIndicatorPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickPageIndicator : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickPageIndicator : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL)

4
src/templates/qquickpane_p.h
View File

@ -48,14 +48,14 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
#include <QtQml/qqmllist.h>
QT_BEGIN_NAMESPACE
class QQuickPanePrivate;
class Q_LABSTEMPLATES_EXPORT QQuickPane : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickPane : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL)

4
src/templates/qquickpane_p_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
QT_BEGIN_NAMESPACE
class QQuickPane;
class Q_LABSTEMPLATES_EXPORT QQuickPanePrivate : public QQuickControlPrivate
class Q_QUICKTEMPLATES_EXPORT QQuickPanePrivate : public QQuickControlPrivate
{
Q_DECLARE_PUBLIC(QQuickPane)

4
src/templates/qquickpopup_p.h
View File

@ -51,7 +51,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qmargins.h>
#include <QtGui/qevent.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
#include <QtQml/qqml.h>
#include <QtQml/qqmllist.h>
#include <QtQml/qqmlparserstatus.h>
@ -67,7 +67,7 @@ class QQuickWindow;
class QQuickPopupPrivate;
class QQuickTransition;
class Q_LABSTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStatus
class Q_QUICKTEMPLATES_EXPORT QQuickPopup : public QObject, public QQmlParserStatus
{
Q_OBJECT
Q_INTERFACES(QQmlParserStatus)

4
src/templates/qquickprogressbar_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickProgressBarPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickProgressBar : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickProgressBar : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)

4
src/templates/qquickradiobutton_p.h
View File

@ -48,11 +48,11 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class Q_LABSTEMPLATES_EXPORT QQuickRadioButton : public QQuickAbstractButton
class Q_QUICKTEMPLATES_EXPORT QQuickRadioButton : public QQuickAbstractButton
{
Q_OBJECT

6
src/templates/qquickrangeslider_p.h
View File

@ -48,14 +48,14 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickRangeSliderPrivate;
class QQuickRangeSliderNode;
class Q_LABSTEMPLATES_EXPORT QQuickRangeSlider : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickRangeSlider : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
@ -132,7 +132,7 @@ private:
class QQuickRangeSliderNodePrivate;
class Q_LABSTEMPLATES_EXPORT QQuickRangeSliderNode : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickRangeSliderNode : public QObject
{
Q_OBJECT
Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged FINAL)

6
src/templates/qquickscrollbar_p.h
View File

@ -48,7 +48,7 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
@ -56,7 +56,7 @@ class QQuickFlickable;
class QQuickScrollBarAttached;
class QQuickScrollBarPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickScrollBar : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickScrollBar : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL)
@ -117,7 +117,7 @@ private:
class QQuickScrollBarAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickScrollBarAttached : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickScrollBarAttached : public QObject
{
Q_OBJECT
Q_PROPERTY(QQuickScrollBar *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)

6
src/templates/qquickscrollindicator_p.h
View File

@ -48,7 +48,7 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
@ -56,7 +56,7 @@ class QQuickFlickable;
class QQuickScrollIndicatorAttached;
class QQuickScrollIndicatorPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickScrollIndicator : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickScrollIndicator : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL)
@ -105,7 +105,7 @@ private:
class QQuickScrollIndicatorAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickScrollIndicatorAttached : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickScrollIndicatorAttached : public QObject
{
Q_OBJECT
Q_PROPERTY(QQuickScrollIndicator *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)

4
src/templates/qquickslider_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickSliderPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickSlider : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickSlider : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)

6
src/templates/qquickspinbox_p.h
View File

@ -48,7 +48,7 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
#include <QtQml/qjsvalue.h>
QT_BEGIN_NAMESPACE
@ -58,7 +58,7 @@ class QQuickSpinButton;
class QQuickSpinButtonPrivate;
class QQuickSpinBoxPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickSpinBox : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickSpinBox : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(int from READ from WRITE setFrom NOTIFY fromChanged FINAL)
@ -139,7 +139,7 @@ private:
Q_DECLARE_PRIVATE(QQuickSpinBox)
};
class Q_LABSTEMPLATES_EXPORT QQuickSpinButton : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickSpinButton : public QObject
{
Q_OBJECT
Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL)

6
src/templates/qquickstackview_p.h
View File

@ -48,7 +48,7 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
@ -58,7 +58,7 @@ class QQuickStackElement;
class QQuickStackAttached;
class QQuickStackViewPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickStackView : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickStackView : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(bool busy READ isBusy NOTIFY busyChanged FINAL)
@ -156,7 +156,7 @@ private:
class QQuickStackAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickStackAttached : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickStackAttached : public QObject
{
Q_OBJECT
Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)

4
src/templates/qquickstackview_p_p.h
View File

@ -48,8 +48,8 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickstackview_p.h>
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickstackview_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
#include <QtQuick/private/qquickitemviewtransition_p.h>
#include <QtQuick/private/qquickitemchangelistener_p.h>
#include <QtQml/private/qv4persistent_p.h>

6
src/templates/qquickswipedelegate_p.h
View File

@ -48,14 +48,14 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class QQuickSwipeDelegatePrivate;
class QQuickSwipeExposure;
class Q_LABSTEMPLATES_EXPORT QQuickSwipeDelegate : public QQuickAbstractButton
class Q_QUICKTEMPLATES_EXPORT QQuickSwipeDelegate : public QQuickAbstractButton
{
Q_OBJECT
Q_PROPERTY(QQuickSwipeExposure *exposure READ exposure CONSTANT)
@ -84,7 +84,7 @@ private:
class QQuickSwipeExposurePrivate;
class Q_LABSTEMPLATES_EXPORT QQuickSwipeExposure : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickSwipeExposure : public QObject
{
Q_OBJECT
Q_PROPERTY(qreal position READ position NOTIFY positionChanged FINAL)

2
src/templates/qquickswipeview.cpp
View File

@ -37,7 +37,7 @@
#include "qquickswipeview_p.h"
#include <QtQml/qqmlinfo.h>
#include <QtLabsTemplates/private/qquickcontainer_p_p.h>
#include <QtQuickTemplates/private/qquickcontainer_p_p.h>
QT_BEGIN_NAMESPACE

6
src/templates/qquickswipeview_p.h
View File

@ -48,14 +48,14 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontainer_p.h>
#include <QtQuickTemplates/private/qquickcontainer_p.h>
QT_BEGIN_NAMESPACE
class QQuickSwipeViewAttached;
class QQuickSwipeViewPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickSwipeView : public QQuickContainer
class Q_QUICKTEMPLATES_EXPORT QQuickSwipeView : public QQuickContainer
{
Q_OBJECT
@ -75,7 +75,7 @@ private:
class QQuickSwipeViewAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickSwipeViewAttached : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickSwipeViewAttached : public QObject
{
Q_OBJECT
Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)

4
src/templates/qquickswitch_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class QQuickSwitchPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickSwitch : public QQuickAbstractButton
class Q_QUICKTEMPLATES_EXPORT QQuickSwitch : public QQuickAbstractButton
{
Q_OBJECT
Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL)

4
src/templates/qquicktabbar_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickcontainer_p.h>
#include <QtQuickTemplates/private/qquickcontainer_p.h>
QT_BEGIN_NAMESPACE
class QQuickTabBarPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickTabBar : public QQuickContainer
class Q_QUICKTEMPLATES_EXPORT QQuickTabBar : public QQuickContainer
{
Q_OBJECT
Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)

4
src/templates/qquicktabbutton_p.h
View File

@ -48,11 +48,11 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickabstractbutton_p.h>
#include <QtQuickTemplates/private/qquickabstractbutton_p.h>
QT_BEGIN_NAMESPACE
class Q_LABSTEMPLATES_EXPORT QQuickTabButton : public QQuickAbstractButton
class Q_QUICKTEMPLATES_EXPORT QQuickTabButton : public QQuickAbstractButton
{
Q_OBJECT

4
src/templates/qquicktextarea_p.h
View File

@ -49,7 +49,7 @@
//
#include <QtQuick/private/qquicktextedit_p.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
QT_BEGIN_NAMESPACE
@ -57,7 +57,7 @@ class QQuickText;
class QQuickTextAreaPrivate;
class QQuickMouseEvent;
class Q_LABSTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit
class Q_QUICKTEMPLATES_EXPORT QQuickTextArea : public QQuickTextEdit
{
Q_OBJECT
Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override

2
src/templates/qquicktextarea_p_p.h
View File

@ -49,7 +49,7 @@
//
#include <QtQuick/private/qquicktextedit_p_p.h>
#include <QtLabsTemplates/private/qquickpressandholdhelper_p.h>
#include <QtQuickTemplates/private/qquickpressandholdhelper_p.h>
#include "qquicktextarea_p.h"

4
src/templates/qquicktextfield_p.h
View File

@ -49,7 +49,7 @@
//
#include <QtQuick/private/qquicktextinput_p.h>
#include <QtLabsTemplates/private/qtlabstemplatesglobal_p.h>
#include <QtQuickTemplates/private/qtquicktemplatesglobal_p.h>
QT_BEGIN_NAMESPACE
@ -57,7 +57,7 @@ class QQuickText;
class QQuickTextFieldPrivate;
class QQuickMouseEvent;
class Q_LABSTEMPLATES_EXPORT QQuickTextField : public QQuickTextInput
class Q_QUICKTEMPLATES_EXPORT QQuickTextField : public QQuickTextInput
{
Q_OBJECT
Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override

2
src/templates/qquicktextfield_p_p.h
View File

@ -49,7 +49,7 @@
//
#include <QtQuick/private/qquicktextinput_p_p.h>
#include <QtLabsTemplates/private/qquickpressandholdhelper_p.h>
#include <QtQuickTemplates/private/qquickpressandholdhelper_p.h>
#include "qquicktextfield_p.h"

4
src/templates/qquicktoolbar_p.h
View File

@ -48,13 +48,13 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickframe_p.h>
#include <QtQuickTemplates/private/qquickframe_p.h>
QT_BEGIN_NAMESPACE
class QQuickToolBarPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickToolBar : public QQuickFrame
class Q_QUICKTEMPLATES_EXPORT QQuickToolBar : public QQuickFrame
{
Q_OBJECT
Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)

4
src/templates/qquicktoolbutton_p.h
View File

@ -48,11 +48,11 @@
// We mean it.
//
#include <QtLabsTemplates/private/qquickbutton_p.h>
#include <QtQuickTemplates/private/qquickbutton_p.h>
QT_BEGIN_NAMESPACE
class Q_LABSTEMPLATES_EXPORT QQuickToolButton : public QQuickButton
class Q_QUICKTEMPLATES_EXPORT QQuickToolButton : public QQuickButton
{
Q_OBJECT

2
src/templates/qquicktumbler.cpp
View File

@ -37,7 +37,7 @@
#include "qquicktumbler_p.h"
#include <QtQuick/private/qquickflickable_p.h>
#include <QtLabsTemplates/private/qquickcontrol_p_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p_p.h>
QT_BEGIN_NAMESPACE

6
src/templates/qquicktumbler_p.h
View File

@ -50,14 +50,14 @@
#include <QtCore/qvariant.h>
#include <QtQml/qqmlcomponent.h>
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickTumblerAttached;
class QQuickTumblerPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickTumbler : public QQuickControl
class Q_QUICKTEMPLATES_EXPORT QQuickTumbler : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged FINAL)
@ -112,7 +112,7 @@ private:
class QQuickTumblerAttachedPrivate;
class Q_LABSTEMPLATES_EXPORT QQuickTumblerAttached : public QObject
class Q_QUICKTEMPLATES_EXPORT QQuickTumblerAttached : public QObject
{
Q_OBJECT
Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT)

14
src/templates/qtlabstemplatesglobal_p.h → src/templates/qtquicktemplatesglobal_p.h
View File

@ -34,8 +34,8 @@
**
****************************************************************************/
#ifndef QTLABSTEMPLATESGLOBAL_P_H
#define QTLABSTEMPLATESGLOBAL_P_H
#ifndef QTQUICKTEMPLATESGLOBAL_H
#define QTQUICKTEMPLATESGLOBAL_H
//
// W A R N I N G
@ -53,15 +53,15 @@
QT_BEGIN_NAMESPACE
#ifndef QT_STATIC
# if defined(QT_BUILD_LABSTEMPLATES_LIB)
# define Q_LABSTEMPLATES_EXPORT Q_DECL_EXPORT
# if defined(QT_BUILD_QUICKTEMPLATES_LIB)
# define Q_QUICKTEMPLATES_EXPORT Q_DECL_EXPORT
# else
# define Q_LABSTEMPLATES_EXPORT Q_DECL_IMPORT
# define Q_QUICKTEMPLATES_EXPORT Q_DECL_IMPORT
# endif
#else
# define Q_LABSTEMPLATES_EXPORT
# define Q_QUICKTEMPLATES_EXPORT
#endif
QT_END_NAMESPACE
#endif // QTLABSTEMPLATESGLOBAL_P_H
#endif // QTQUICKTEMPLATESGLOBAL_H

6
src/templates/templates.pro
View File

@ -1,5 +1,5 @@
TARGET = QtLabsTemplates
MODULE = labstemplates
TARGET = QtQuickTemplates
MODULE = quicktemplates
CONFIG += internal_module
QT += quick
@ -8,7 +8,7 @@ QT_PRIVATE += core-private gui-private qml-private quick-private
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
HEADERS += \
$$PWD/qtlabstemplatesglobal_p.h
$$PWD/qtquicktemplatesglobal_p.h
include(templates.pri)
load(qt_module)

4
sync.profile
View File

@ -1,6 +1,6 @@
%modules = ( # path to module name map
"QtLabsControls" => "$basedir/src/controls",
"QtLabsTemplates" => "$basedir/src/templates",
"QtQuickControls" => "$basedir/src/controls",
"QtQuickTemplates" => "$basedir/src/templates",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
);

2
tests/auto/accessibility/accessibility.pro
View File

@ -4,7 +4,7 @@ SOURCES += tst_accessibility.cpp
osx:CONFIG -= app_bundle
QT += core-private gui-private qml-private quick-private labstemplates-private testlib
QT += core-private gui-private qml-private quick-private quicktemplates-private testlib
include (../shared/util.pri)

2
tests/auto/accessibility/tst_accessibility.cpp
View File

@ -41,7 +41,7 @@
#include <QtQml/qqmlcontext.h>
#include <QtQuick/qquickview.h>
#include <QtQuick/private/qquickitem_p.h>
#include <QtLabsTemplates/private/qquickpopup_p.h>
#include <QtQuickTemplates/private/qquickpopup_p.h>
#include "../shared/util.h"
#include "../shared/visualtestutil.h"

2
tests/auto/applicationwindow/applicationwindow.pro
View File

@ -4,7 +4,7 @@ SOURCES += tst_applicationwindow.cpp
osx:CONFIG -= app_bundle
QT += core-private gui-private qml-private quick-private labstemplates-private labscontrols-private testlib
QT += core-private gui-private qml-private quick-private quicktemplates-private quickcontrols-private testlib
include (../shared/util.pri)

14
tests/auto/applicationwindow/tst_applicationwindow.cpp
View File

@ -42,13 +42,13 @@
#include <QtQuick/qquickview.h>
#include <QtQuick/private/qquickitem_p.h>
#include <QtGui/private/qguiapplication_p.h>
#include <QtLabsTemplates/private/qquickapplicationwindow_p.h>
#include <QtLabsTemplates/private/qquickoverlay_p.h>
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtLabsTemplates/private/qquicklabel_p.h>
#include <QtLabsTemplates/private/qquicktextarea_p.h>
#include <QtLabsTemplates/private/qquicktextfield_p.h>
#include <QtLabsControls/private/qquickproxytheme_p.h>
#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
#include <QtQuickTemplates/private/qquickoverlay_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquicklabel_p.h>
#include <QtQuickTemplates/private/qquicktextarea_p.h>
#include <QtQuickTemplates/private/qquicktextfield_p.h>
#include <QtQuickControls/private/qquickproxytheme_p.h>
#include "../shared/util.h"
#include "../shared/visualtestutil.h"

2
tests/auto/focus/focus.pro
View File

@ -8,4 +8,4 @@ include (../shared/util.pri)
TESTDATA = data/*
QT += core-private gui-private qml-private quick-private labstemplates-private testlib
QT += core-private gui-private qml-private quick-private quicktemplates-private testlib

2
tests/auto/focus/tst_focus.cpp
View File

@ -41,7 +41,7 @@
#include <QtQml/qqmlcontext.h>
#include <QtQuick/qquickview.h>
#include <QtQuick/private/qquickitem_p.h>
#include <QtLabsTemplates/private/qquickcontrol_p.h>
#include <QtQuickTemplates/private/qquickcontrol_p.h>
#include <QtGui/private/qguiapplication_p.h>
#include <QtGui/qstylehints.h>
#include "../shared/util.h"

2
tests/auto/menu/menu.pro
View File

@ -4,7 +4,7 @@ SOURCES += tst_menu.cpp
osx:CONFIG -= app_bundle
QT += core-private gui-private qml-private quick-private testlib labstemplates-private
QT += core-private gui-private qml-private quick-private testlib quicktemplates-private
include (../shared/util.pri)

10
tests/auto/menu/tst_menu.cpp
View File

@ -45,11 +45,11 @@
#include "../shared/util.h"
#include "../shared/visualtestutil.h"
#include <QtLabsTemplates/private/qquickapplicationwindow_p.h>
#include <QtLabsTemplates/private/qquickoverlay_p.h>
#include <QtLabsTemplates/private/qquickbutton_p.h>
#include <QtLabsTemplates/private/qquickmenu_p.h>
#include <QtLabsTemplates/private/qquickmenuitem_p.h>
#include <QtQuickTemplates/private/qquickapplicationwindow_p.h>
#include <QtQuickTemplates/private/qquickoverlay_p.h>
#include <QtQuickTemplates/private/qquickbutton_p.h>
#include <QtQuickTemplates/private/qquickmenu_p.h>
#include <QtQuickTemplates/private/qquickmenuitem_p.h>
using namespace QQuickVisualTestUtil;

2
tests/auto/popup/popup.pro
View File

@ -4,7 +4,7 @@ SOURCES += tst_popup.cpp
osx:CONFIG -= app_bundle
QT += core-private gui-private qml-private quick-private testlib labstemplates-private
QT += core-private gui-private qml-private quick-private testlib quicktemplates-private
include (../shared/util.pri)

Some files were not shown because too many files have changed in this diff Show More