diff options
103 files changed, 266 insertions, 265 deletions
diff --git a/examples/controls/gallery/gallery.pro b/examples/controls/gallery/gallery.pro index 8f3e7f86..12f799e8 100644 --- a/examples/controls/gallery/gallery.pro +++ b/examples/controls/gallery/gallery.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = gallery -QT += quick labscontrols +QT += quick quickcontrols SOURCES += \ gallery.cpp diff --git a/src/controls/controls.pro b/src/controls/controls.pro index 953ca1ae..16f2005c 100644 --- a/src/controls/controls.pro +++ b/src/controls/controls.pro @@ -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) diff --git a/src/controls/qquickcolorimageprovider_p.h b/src/controls/qquickcolorimageprovider_p.h index f50668f8..475449d5 100644 --- a/src/controls/qquickcolorimageprovider_p.h +++ b/src/controls/qquickcolorimageprovider_p.h @@ -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); diff --git a/src/controls/qquickpaddedrectangle_p.h b/src/controls/qquickpaddedrectangle_p.h index 22cd54f4..b8c8dc4a 100644 --- a/src/controls/qquickpaddedrectangle_p.h +++ b/src/controls/qquickpaddedrectangle_p.h @@ -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) diff --git a/src/controls/qquickproxytheme_p.h b/src/controls/qquickproxytheme_p.h index f20201ac..5f4b42b5 100644 --- a/src/controls/qquickproxytheme_p.h +++ b/src/controls/qquickproxytheme_p.h @@ -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); diff --git a/src/controls/qquickstyle.h b/src/controls/qquickstyle.h index 062b7fbb..6946a214 100644 --- a/src/controls/qquickstyle.h +++ b/src/controls/qquickstyle.h @@ -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(); diff --git a/src/controls/qquickstyleattached.cpp b/src/controls/qquickstyleattached.cpp index 91ad6b10..7b93a0a5 100644 --- a/src/controls/qquickstyleattached.cpp +++ b/src/controls/qquickstyleattached.cpp @@ -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 diff --git a/src/controls/qquickstyleattached_p.h b/src/controls/qquickstyleattached_p.h index 61e04bf6..7835a482 100644 --- a/src/controls/qquickstyleattached_p.h +++ b/src/controls/qquickstyleattached_p.h @@ -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 diff --git a/src/controls/qquickstyleselector_p.h b/src/controls/qquickstyleselector_p.h index 56a3b386..86e550e7 100644 --- a/src/controls/qquickstyleselector_p.h +++ b/src/controls/qquickstyleselector_p.h @@ -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(); diff --git a/src/controls/qtlabscontrolsglobal.h b/src/controls/qtquickcontrolsglobal.h index 08cef64a..98926da4 100644 --- a/src/controls/qtlabscontrolsglobal.h +++ b/src/controls/qtquickcontrolsglobal.h @@ -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 diff --git a/src/controls/qtlabscontrolsglobal_p.h b/src/controls/qtquickcontrolsglobal_p.h index a8938ec5..ff91b44d 100644 --- a/src/controls/qtlabscontrolsglobal_p.h +++ b/src/controls/qtquickcontrolsglobal_p.h @@ -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 diff --git a/src/imports/calendar/calendar.pro b/src/imports/calendar/calendar.pro index 0dee3cb1..7c375139 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_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 diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp index 1f5e4387..8530389f 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 <QtLabsTemplates/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/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 b0c4ead9..7c69bba0 100644 --- a/src/imports/calendar/qquickdayofweekrow_p.h +++ b/src/imports/calendar/qquickdayofweekrow_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtLabsTemplates/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp index c6ad3d53..084ade3c 100644 --- a/src/imports/calendar/qquickmonthgrid.cpp +++ b/src/imports/calendar/qquickmonthgrid.cpp @@ -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 diff --git a/src/imports/calendar/qquickmonthgrid_p.h b/src/imports/calendar/qquickmonthgrid_p.h index 93ba3900..df5f1716 100644 --- a/src/imports/calendar/qquickmonthgrid_p.h +++ b/src/imports/calendar/qquickmonthgrid_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtLabsTemplates/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp index a128b500..1aac33f9 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 <QtLabsTemplates/private/qquickcontrol_p_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p_p.h> #include <QtQml/qqmlinfo.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/calendar/qquickweeknumbercolumn_p.h b/src/imports/calendar/qquickweeknumbercolumn_p.h index f2e0e1cc..92606fc8 100644 --- a/src/imports/calendar/qquickweeknumbercolumn_p.h +++ b/src/imports/calendar/qquickweeknumbercolumn_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtLabsTemplates/private/qquickcontrol_p.h> +#include <QtQuickTemplates/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index 0fc73673..c6f9d7f0 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -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) diff --git a/src/imports/controls/material/material.pro b/src/imports/controls/material/material.pro index 63450289..2f62a195 100644 --- a/src/imports/controls/material/material.pro +++ b/src/imports/controls/material/material.pro @@ -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 diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp index 4788001f..e73aaef5 100644 --- a/src/imports/controls/material/qquickmaterialstyle.cpp +++ b/src/imports/controls/material/qquickmaterialstyle.cpp @@ -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 diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h index 2bf2915e..aa8aa9f4 100644 --- a/src/imports/controls/material/qquickmaterialstyle_p.h +++ b/src/imports/controls/material/qquickmaterialstyle_p.h @@ -49,7 +49,7 @@ // #include <QtGui/qcolor.h> -#include <QtLabsControls/private/qquickstyleattached_p.h> +#include <QtQuickControls/private/qquickstyleattached_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index af899c6f..9fd74bcc 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -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 diff --git a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp index 95e09225..a42424ea 100644 --- a/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp +++ b/src/imports/controls/material/qtlabsmaterialstyleplugin.cpp @@ -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() { diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir index 98c57fe1..3250e255 100644 --- a/src/imports/controls/qmldir +++ b/src/imports/controls/qmldir @@ -1,5 +1,5 @@ module Qt.labs.controls -plugin qtlabscontrolsplugin -classname QtLabsControlsPlugin +plugin qtquickcontrolsplugin +classname QtQuickControlsPlugin depends Qt.labs.templates 1.0 designersupported diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtquickcontrolsplugin.cpp index 9196f685..10b57347 100644 --- a/src/imports/controls/qtlabscontrolsplugin.cpp +++ b/src/imports/controls/qtquickcontrolsplugin.cpp @@ -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" diff --git a/src/imports/controls/qtlabscontrolsplugin.qrc b/src/imports/controls/qtquickcontrolsplugin.qrc index 1147ae3d..1147ae3d 100644 --- a/src/imports/controls/qtlabscontrolsplugin.qrc +++ b/src/imports/controls/qtquickcontrolsplugin.qrc diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp index ee678609..fb948dec 100644 --- a/src/imports/controls/universal/qquickuniversalstyle.cpp +++ b/src/imports/controls/universal/qquickuniversalstyle.cpp @@ -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 diff --git a/src/imports/controls/universal/qquickuniversalstyle_p.h b/src/imports/controls/universal/qquickuniversalstyle_p.h index 47a6de4a..b0787389 100644 --- a/src/imports/controls/universal/qquickuniversalstyle_p.h +++ b/src/imports/controls/universal/qquickuniversalstyle_p.h @@ -49,7 +49,7 @@ // #include <QtGui/qcolor.h> -#include <QtLabsControls/private/qquickstyleattached_p.h> +#include <QtQuickControls/private/qquickstyleattached_p.h> QT_BEGIN_NAMESPACE diff --git a/src/imports/controls/universal/qquickuniversaltheme_p.h b/src/imports/controls/universal/qquickuniversaltheme_p.h index 809d7a89..07e4905d 100644 --- a/src/imports/controls/universal/qquickuniversaltheme_p.h +++ b/src/imports/controls/universal/qquickuniversaltheme_p.h @@ -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 diff --git a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp index b3bb421e..15857f67 100644 --- a/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp +++ b/src/imports/controls/universal/qtlabsuniversalstyleplugin.cpp @@ -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() { diff --git a/src/imports/controls/universal/universal.pro b/src/imports/controls/universal/universal.pro index 88bad8f7..76d3d89e 100644 --- a/src/imports/controls/universal/universal.pro +++ b/src/imports/controls/universal/universal.pro @@ -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 diff --git a/src/imports/templates/qmldir b/src/imports/templates/qmldir index 74dcf0ff..de0d0cfc 100644 --- a/src/imports/templates/qmldir +++ b/src/imports/templates/qmldir @@ -1,4 +1,4 @@ module Qt.labs.templates -plugin qtlabstemplatesplugin -classname QtLabsTemplatesPlugin +plugin qtquicktemplatesplugin +classname QtQuickTemplatesPlugin depends QtQuick.Window 2.2 diff --git a/src/imports/templates/qtlabstemplatesplugin.cpp b/src/imports/templates/qtquicktemplatesplugin.cpp index ab50bcbc..4da5eb4d 100644 --- a/src/imports/templates/qtlabstemplatesplugin.cpp +++ b/src/imports/templates/qtquicktemplatesplugin.cpp @@ -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" diff --git a/src/imports/templates/templates.pro b/src/imports/templates/templates.pro index 0e48168c..f3dd85c9 100644 --- a/src/imports/templates/templates.pro +++ b/src/imports/templates/templates.pro @@ -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) diff --git a/src/templates/qquickabstractbutton_p.h b/src/templates/qquickabstractbutton_p.h index 9469e706..3877a96d 100644 --- a/src/templates/qquickabstractbutton_p.h +++ b/src/templates/qquickabstractbutton_p.h @@ -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) diff --git a/src/templates/qquickabstractbutton_p_p.h b/src/templates/qquickabstractbutton_p_p.h index 409fd52e..a26785ae 100644 --- a/src/templates/qquickabstractbutton_p_p.h +++ b/src/templates/qquickabstractbutton_p_p.h @@ -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 diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h index 9a6963e2..1a0b82ec 100644 --- a/src/templates/qquickapplicationwindow_p.h +++ b/src/templates/qquickapplicationwindow_p.h @@ -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) diff --git a/src/templates/qquickbusyindicator_p.h b/src/templates/qquickbusyindicator_p.h index e5e72044..a7198639 100644 --- a/src/templates/qquickbusyindicator_p.h +++ b/src/templates/qquickbusyindicator_p.h @@ -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) diff --git a/src/templates/qquickbutton_p.h b/src/templates/qquickbutton_p.h index 12c3667c..cfdf1044 100644 --- a/src/templates/qquickbutton_p.h +++ b/src/templates/qquickbutton_p.h @@ -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 diff --git a/src/templates/qquickbuttongroup_p.h b/src/templates/qquickbuttongroup_p.h index 5863e70b..4c0d6fef 100644 --- a/src/templates/qquickbuttongroup_p.h +++ b/src/templates/qquickbuttongroup_p.h @@ -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) diff --git a/src/templates/qquickcheckbox_p.h b/src/templates/qquickcheckbox_p.h index e3dcf76e..c2b3d6b6 100644 --- a/src/templates/qquickcheckbox_p.h +++ b/src/templates/qquickcheckbox_p.h @@ -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) diff --git a/src/templates/qquickcombobox_p.h b/src/templates/qquickcombobox_p.h index 23def3c8..b4c04022 100644 --- a/src/templates/qquickcombobox_p.h +++ b/src/templates/qquickcombobox_p.h @@ -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) diff --git a/src/templates/qquickcontainer_p.h b/src/templates/qquickcontainer_p.h index e11d5716..e60c13a7 100644 --- a/src/templates/qquickcontainer_p.h +++ b/src/templates/qquickcontainer_p.h @@ -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) diff --git a/src/templates/qquickcontainer_p_p.h b/src/templates/qquickcontainer_p_p.h index 8c1d470c..3382d104 100644 --- a/src/templates/qquickcontainer_p_p.h +++ b/src/templates/qquickcontainer_p_p.h @@ -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) diff --git a/src/templates/qquickcontrol_p.h b/src/templates/qquickcontrol_p.h index 8a397db9..e393e827 100644 --- a/src/templates/qquickcontrol_p.h +++ b/src/templates/qquickcontrol_p.h @@ -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) diff --git a/src/templates/qquickcontrol_p_p.h b/src/templates/qquickcontrol_p_p.h index 01a64b58..0b8644ec 100644 --- a/src/templates/qquickcontrol_p_p.h +++ b/src/templates/qquickcontrol_p_p.h @@ -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 diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp index e1083b35..89baec20 100644 --- a/src/templates/qquickdial.cpp +++ b/src/templates/qquickdial.cpp @@ -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 diff --git a/src/templates/qquickdial_p.h b/src/templates/qquickdial_p.h index 2fd2f649..dd75b2ba 100644 --- a/src/templates/qquickdial_p.h +++ b/src/templates/qquickdial_p.h @@ -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) diff --git a/src/templates/qquickdrawer.cpp b/src/templates/qquickdrawer.cpp index a28d11a6..9fe2c4d7 100644 --- a/src/templates/qquickdrawer.cpp +++ b/src/templates/qquickdrawer.cpp @@ -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 diff --git a/src/templates/qquickdrawer_p.h b/src/templates/qquickdrawer_p.h index 39f1802a..ce9a3cb7 100644 --- a/src/templates/qquickdrawer_p.h +++ b/src/templates/qquickdrawer_p.h @@ -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) diff --git a/src/templates/qquickframe_p.h b/src/templates/qquickframe_p.h index 8c35b859..3d03caf1 100644 --- a/src/templates/qquickframe_p.h +++ b/src/templates/qquickframe_p.h @@ -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 diff --git a/src/templates/qquickframe_p_p.h b/src/templates/qquickframe_p_p.h index 4e0f16f6..4d84a9f3 100644 --- a/src/templates/qquickframe_p_p.h +++ b/src/templates/qquickframe_p_p.h @@ -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 { }; diff --git a/src/templates/qquickgroupbox_p.h b/src/templates/qquickgroupbox_p.h index 81ba58ab..4c33f1dd 100644 --- a/src/templates/qquickgroupbox_p.h +++ b/src/templates/qquickgroupbox_p.h @@ -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) diff --git a/src/templates/qquickitemdelegate_p.h b/src/templates/qquickitemdelegate_p.h index 24d90c20..c1e9c002 100644 --- a/src/templates/qquickitemdelegate_p.h +++ b/src/templates/qquickitemdelegate_p.h @@ -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 diff --git a/src/templates/qquicklabel_p.h b/src/templates/qquicklabel_p.h index 7bb09d1b..e2084fe0 100644 --- a/src/templates/qquicklabel_p.h +++ b/src/templates/qquicklabel_p.h @@ -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 diff --git a/src/templates/qquickmenu_p.h b/src/templates/qquickmenu_p.h index 4ae05e97..c6ee52c8 100644 --- a/src/templates/qquickmenu_p.h +++ b/src/templates/qquickmenu_p.h @@ -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) diff --git a/src/templates/qquickmenu_p_p.h b/src/templates/qquickmenu_p_p.h index 457c9619..70230262 100644 --- a/src/templates/qquickmenu_p_p.h +++ b/src/templates/qquickmenu_p_p.h @@ -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) diff --git a/src/templates/qquickmenuitem_p.h b/src/templates/qquickmenuitem_p.h index 812597be..d73e1081 100644 --- a/src/templates/qquickmenuitem_p.h +++ b/src/templates/qquickmenuitem_p.h @@ -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 diff --git a/src/templates/qquickoverlay_p.h b/src/templates/qquickoverlay_p.h index 33e008c5..3aed5a82 100644 --- a/src/templates/qquickoverlay_p.h +++ b/src/templates/qquickoverlay_p.h @@ -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) diff --git a/src/templates/qquickpage_p.h b/src/templates/qquickpage_p.h index c21bb0ac..b9e45c77 100644 --- a/src/templates/qquickpage_p.h +++ b/src/templates/qquickpage_p.h @@ -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) diff --git a/src/templates/qquickpageindicator_p.h b/src/templates/qquickpageindicator_p.h index b776cbb6..d94e470a 100644 --- a/src/templates/qquickpageindicator_p.h +++ b/src/templates/qquickpageindicator_p.h @@ -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) diff --git a/src/templates/qquickpane_p.h b/src/templates/qquickpane_p.h index 51039f32..c3529bf4 100644 --- a/src/templates/qquickpane_p.h +++ b/src/templates/qquickpane_p.h @@ -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) diff --git a/src/templates/qquickpane_p_p.h b/src/templates/qquickpane_p_p.h index 477dc0bc..34feff07 100644 --- a/src/templates/qquickpane_p_p.h +++ b/src/templates/qquickpane_p_p.h @@ -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) diff --git a/src/templates/qquickpopup_p.h b/src/templates/qquickpopup_p.h index 0cb88338..037a042b 100644 --- a/src/templates/qquickpopup_p.h +++ b/src/templates/qquickpopup_p.h @@ -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) diff --git a/src/templates/qquickprogressbar_p.h b/src/templates/qquickprogressbar_p.h index 1bf21b41..7fdbbd96 100644 --- a/src/templates/qquickprogressbar_p.h +++ b/src/templates/qquickprogressbar_p.h @@ -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) diff --git a/src/templates/qquickradiobutton_p.h b/src/templates/qquickradiobutton_p.h index 2b9821aa..f9ebf2f8 100644 --- a/src/templates/qquickradiobutton_p.h +++ b/src/templates/qquickradiobutton_p.h @@ -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 diff --git a/src/templates/qquickrangeslider_p.h b/src/templates/qquickrangeslider_p.h index d81ab98a..ba51713c 100644 --- a/src/templates/qquickrangeslider_p.h +++ b/src/templates/qquickrangeslider_p.h @@ -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) diff --git a/src/templates/qquickscrollbar_p.h b/src/templates/qquickscrollbar_p.h index 6eb8b798..656b8577 100644 --- a/src/templates/qquickscrollbar_p.h +++ b/src/templates/qquickscrollbar_p.h @@ -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) diff --git a/src/templates/qquickscrollindicator_p.h b/src/templates/qquickscrollindicator_p.h index 15002700..b7fcf09e 100644 --- a/src/templates/qquickscrollindicator_p.h +++ b/src/templates/qquickscrollindicator_p.h @@ -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) diff --git a/src/templates/qquickslider_p.h b/src/templates/qquickslider_p.h index a6231d09..92cdd6c8 100644 --- a/src/templates/qquickslider_p.h +++ b/src/templates/qquickslider_p.h @@ -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) diff --git a/src/templates/qquickspinbox_p.h b/src/templates/qquickspinbox_p.h index 60df92bb..55e32e5f 100644 --- a/src/templates/qquickspinbox_p.h +++ b/src/templates/qquickspinbox_p.h @@ -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) diff --git a/src/templates/qquickstackview_p.h b/src/templates/qquickstackview_p.h index 34a430e7..0c76908c 100644 --- a/src/templates/qquickstackview_p.h +++ b/src/templates/qquickstackview_p.h @@ -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) diff --git a/src/templates/qquickstackview_p_p.h b/src/templates/qquickstackview_p_p.h index 93d08034..1d065a5b 100644 --- a/src/templates/qquickstackview_p_p.h +++ b/src/templates/qquickstackview_p_p.h @@ -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> diff --git a/src/templates/qquickswipedelegate_p.h b/src/templates/qquickswipedelegate_p.h index 45d6999c..4e1688ec 100644 --- a/src/templates/qquickswipedelegate_p.h +++ b/src/templates/qquickswipedelegate_p.h @@ -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) diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp index 63dc525f..0e50a4ed 100644 --- a/src/templates/qquickswipeview.cpp +++ b/src/templates/qquickswipeview.cpp @@ -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 diff --git a/src/templates/qquickswipeview_p.h b/src/templates/qquickswipeview_p.h index 7a649300..e6dd69dd 100644 --- a/src/templates/qquickswipeview_p.h +++ b/src/templates/qquickswipeview_p.h @@ -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) diff --git a/src/templates/qquickswitch_p.h b/src/templates/qquickswitch_p.h index ee8f49f8..9097e89b 100644 --- a/src/templates/qquickswitch_p.h +++ b/src/templates/qquickswitch_p.h @@ -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) diff --git a/src/templates/qquicktabbar_p.h b/src/templates/qquicktabbar_p.h index abfd4dc9..76c2e59f 100644 --- a/src/templates/qquicktabbar_p.h +++ b/src/templates/qquicktabbar_p.h @@ -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) diff --git a/src/templates/qquicktabbutton_p.h b/src/templates/qquicktabbutton_p.h index 07a020e5..549615ea 100644 --- a/src/templates/qquicktabbutton_p.h +++ b/src/templates/qquicktabbutton_p.h @@ -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 diff --git a/src/templates/qquicktextarea_p.h b/src/templates/qquicktextarea_p.h index 623dc952..2e031c07 100644 --- a/src/templates/qquicktextarea_p.h +++ b/src/templates/qquicktextarea_p.h @@ -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 diff --git a/src/templates/qquicktextarea_p_p.h b/src/templates/qquicktextarea_p_p.h index 34718149..d63ea5cd 100644 --- a/src/templates/qquicktextarea_p_p.h +++ b/src/templates/qquicktextarea_p_p.h @@ -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" diff --git a/src/templates/qquicktextfield_p.h b/src/templates/qquicktextfield_p.h index ee5f3470..00d6d0c7 100644 --- a/src/templates/qquicktextfield_p.h +++ b/src/templates/qquicktextfield_p.h @@ -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 diff --git a/src/templates/qquicktextfield_p_p.h b/src/templates/qquicktextfield_p_p.h index e5d1a606..5a48e5b7 100644 --- a/src/templates/qquicktextfield_p_p.h +++ b/src/templates/qquicktextfield_p_p.h @@ -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" diff --git a/src/templates/qquicktoolbar_p.h b/src/templates/qquicktoolbar_p.h index f6625847..fe62c127 100644 --- a/src/templates/qquicktoolbar_p.h +++ b/src/templates/qquicktoolbar_p.h @@ -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) diff --git a/src/templates/qquicktoolbutton_p.h b/src/templates/qquicktoolbutton_p.h index a4b4d227..dda0668e 100644 --- a/src/templates/qquicktoolbutton_p.h +++ b/src/templates/qquicktoolbutton_p.h @@ -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 diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp index 38447f6b..9c1baa5c 100644 --- a/src/templates/qquicktumbler.cpp +++ b/src/templates/qquicktumbler.cpp @@ -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 diff --git a/src/templates/qquicktumbler_p.h b/src/templates/qquicktumbler_p.h index 6c329496..7b0126ce 100644 --- a/src/templates/qquicktumbler_p.h +++ b/src/templates/qquicktumbler_p.h @@ -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) diff --git a/src/templates/qtlabstemplatesglobal_p.h b/src/templates/qtquicktemplatesglobal_p.h index 432240e2..671a1ed0 100644 --- a/src/templates/qtlabstemplatesglobal_p.h +++ b/src/templates/qtquicktemplatesglobal_p.h @@ -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 diff --git a/src/templates/templates.pro b/src/templates/templates.pro index 36273577..f28a82ab 100644 --- a/src/templates/templates.pro +++ b/src/templates/templates.pro @@ -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) diff --git a/sync.profile b/sync.profile index df83dc81..dc1bc02c 100644 --- a/sync.profile +++ b/sync.profile @@ -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 ); diff --git a/tests/auto/accessibility/accessibility.pro b/tests/auto/accessibility/accessibility.pro index ca751265..ead68318 100644 --- a/tests/auto/accessibility/accessibility.pro +++ b/tests/auto/accessibility/accessibility.pro @@ -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) diff --git a/tests/auto/accessibility/tst_accessibility.cpp b/tests/auto/accessibility/tst_accessibility.cpp index 8c05e2f2..8bd4d09a 100644 --- a/tests/auto/accessibility/tst_accessibility.cpp +++ b/tests/auto/accessibility/tst_accessibility.cpp @@ -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" diff --git a/tests/auto/applicationwindow/applicationwindow.pro b/tests/auto/applicationwindow/applicationwindow.pro index eabe81bf..4d1b44bd 100644 --- a/tests/auto/applicationwindow/applicationwindow.pro +++ b/tests/auto/applicationwindow/applicationwindow.pro @@ -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) diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp index f78d1f66..24c564ea 100644 --- a/tests/auto/applicationwindow/tst_applicationwindow.cpp +++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp @@ -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" diff --git a/tests/auto/focus/focus.pro b/tests/auto/focus/focus.pro index c4ca8861..cfd155b8 100644 --- a/tests/auto/focus/focus.pro +++ b/tests/auto/focus/focus.pro @@ -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 diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/focus/tst_focus.cpp index aed38c03..18012a42 100644 --- a/tests/auto/focus/tst_focus.cpp +++ b/tests/auto/focus/tst_focus.cpp @@ -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" diff --git a/tests/auto/menu/menu.pro b/tests/auto/menu/menu.pro index 2dd2ac7f..71bb0fb0 100644 --- a/tests/auto/menu/menu.pro +++ b/tests/auto/menu/menu.pro @@ -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) diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp index 825867cf..20b56143 100644 --- a/tests/auto/menu/tst_menu.cpp +++ b/tests/auto/menu/tst_menu.cpp @@ -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; diff --git a/tests/auto/popup/popup.pro b/tests/auto/popup/popup.pro index 87aca3b3..45f55cab 100644 --- a/tests/auto/popup/popup.pro +++ b/tests/auto/popup/popup.pro @@ -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) diff --git a/tests/auto/popup/tst_popup.cpp b/tests/auto/popup/tst_popup.cpp index 61bf999c..ca52272e 100644 --- a/tests/auto/popup/tst_popup.cpp +++ b/tests/auto/popup/tst_popup.cpp @@ -39,10 +39,10 @@ #include "../shared/util.h" #include "../shared/visualtestutil.h" -#include <QtLabsTemplates/private/qquickapplicationwindow_p.h> -#include <QtLabsTemplates/private/qquickoverlay_p.h> -#include <QtLabsTemplates/private/qquickpopup_p.h> -#include <QtLabsTemplates/private/qquickbutton_p.h> +#include <QtQuickTemplates/private/qquickapplicationwindow_p.h> +#include <QtQuickTemplates/private/qquickoverlay_p.h> +#include <QtQuickTemplates/private/qquickpopup_p.h> +#include <QtQuickTemplates/private/qquickbutton_p.h> using namespace QQuickVisualTestUtil; diff --git a/tests/auto/shared/util.pri b/tests/auto/shared/util.pri index 5e6b06b6..61d4d509 100644 --- a/tests/auto/shared/util.pri +++ b/tests/auto/shared/util.pri @@ -1,4 +1,4 @@ -QT += core-private gui-private qml-private quick-private labstemplates-private +QT += core-private gui-private qml-private quick-private quicktemplates-private HEADERS += $$PWD/visualtestutil.h \ $$PWD/util.h diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/shared/visualtestutil.h index b3fecf8e..94c45778 100644 --- a/tests/auto/shared/visualtestutil.h +++ b/tests/auto/shared/visualtestutil.h @@ -42,7 +42,7 @@ #include <QtQuick/private/qquickitem_p.h> -#include <QtLabsTemplates/private/qquickapplicationwindow_p.h> +#include <QtQuickTemplates/private/qquickapplicationwindow_p.h> #include "util.h" |