diff options
Diffstat (limited to 'src/templates')
55 files changed, 118 insertions, 118 deletions
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) |