From 7176f1d5bf9d310cb2568688fea2e201404fdeb6 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Wed, 27 Apr 2016 14:38:39 +0200 Subject: Q_QUICKTEMPLATES2_EXPORT => Q_QUICKTEMPLATES2_PRIVATE_EXPORT They're all private classes. Change-Id: I2f1463429109c5651f9cca5bc7aabe5cf0f79637 Reviewed-by: J-P Nurmi --- src/quicktemplates2/qquickabstractbutton_p.h | 2 +- src/quicktemplates2/qquickapplicationwindow_p.h | 4 ++-- src/quicktemplates2/qquickbusyindicator_p.h | 2 +- src/quicktemplates2/qquickbutton_p.h | 2 +- src/quicktemplates2/qquickbuttongroup_p.h | 4 ++-- src/quicktemplates2/qquickcheckbox_p.h | 2 +- src/quicktemplates2/qquickcheckdelegate_p.h | 2 +- src/quicktemplates2/qquickcombobox_p.h | 2 +- src/quicktemplates2/qquickcontainer_p.h | 2 +- src/quicktemplates2/qquickcontainer_p_p.h | 2 +- src/quicktemplates2/qquickcontrol_p.h | 2 +- src/quicktemplates2/qquickcontrol_p_p.h | 2 +- src/quicktemplates2/qquickdial_p.h | 2 +- src/quicktemplates2/qquickdrawer_p.h | 2 +- src/quicktemplates2/qquickframe_p.h | 2 +- src/quicktemplates2/qquickframe_p_p.h | 2 +- src/quicktemplates2/qquickgroupbox_p.h | 2 +- src/quicktemplates2/qquickitemdelegate_p.h | 2 +- src/quicktemplates2/qquicklabel_p.h | 2 +- src/quicktemplates2/qquickmenu_p.h | 2 +- src/quicktemplates2/qquickmenu_p_p.h | 2 +- src/quicktemplates2/qquickmenuitem_p.h | 2 +- src/quicktemplates2/qquickoverlay_p.h | 2 +- src/quicktemplates2/qquickpage_p.h | 2 +- src/quicktemplates2/qquickpageindicator_p.h | 2 +- src/quicktemplates2/qquickpane_p.h | 2 +- src/quicktemplates2/qquickpane_p_p.h | 2 +- src/quicktemplates2/qquickpopup_p.h | 2 +- src/quicktemplates2/qquickprogressbar_p.h | 2 +- src/quicktemplates2/qquickradiobutton_p.h | 2 +- src/quicktemplates2/qquickradiodelegate_p.h | 2 +- src/quicktemplates2/qquickrangeslider_p.h | 4 ++-- src/quicktemplates2/qquickscrollbar_p.h | 4 ++-- src/quicktemplates2/qquickscrollindicator_p.h | 4 ++-- src/quicktemplates2/qquickslider_p.h | 2 +- src/quicktemplates2/qquickspinbox_p.h | 4 ++-- src/quicktemplates2/qquickstackview_p.h | 4 ++-- src/quicktemplates2/qquickswipedelegate_p.h | 4 ++-- src/quicktemplates2/qquickswipeview_p.h | 4 ++-- src/quicktemplates2/qquickswitch_p.h | 2 +- src/quicktemplates2/qquickswitchdelegate_p.h | 2 +- src/quicktemplates2/qquicktabbar_p.h | 2 +- src/quicktemplates2/qquicktabbutton_p.h | 2 +- src/quicktemplates2/qquicktextarea_p.h | 4 ++-- src/quicktemplates2/qquicktextfield_p.h | 2 +- src/quicktemplates2/qquicktoolbar_p.h | 2 +- src/quicktemplates2/qquicktoolbutton_p.h | 2 +- src/quicktemplates2/qquicktooltip_p.h | 4 ++-- src/quicktemplates2/qquicktumbler_p.h | 4 ++-- src/quicktemplates2/qtquicktemplates2global_p.h | 6 +++--- 50 files changed, 64 insertions(+), 64 deletions(-) diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h index ca48c7e8..f23d29f3 100644 --- a/src/quicktemplates2/qquickabstractbutton_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickAbstractButtonPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickAbstractButton : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButton : public QQuickControl { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL) diff --git a/src/quicktemplates2/qquickapplicationwindow_p.h b/src/quicktemplates2/qquickapplicationwindow_p.h index e55c8ff2..820c6d23 100644 --- a/src/quicktemplates2/qquickapplicationwindow_p.h +++ b/src/quicktemplates2/qquickapplicationwindow_p.h @@ -60,7 +60,7 @@ class QQuickApplicationWindowPrivate; class QQuickApplicationWindowAttached; class QQuickApplicationWindowAttachedPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl { Q_OBJECT Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL) @@ -125,7 +125,7 @@ private: QScopedPointer d_ptr; }; -class Q_QUICKTEMPLATES2_EXPORT QQuickApplicationWindowAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindowAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickApplicationWindow *window READ window NOTIFY windowChanged FINAL) diff --git a/src/quicktemplates2/qquickbusyindicator_p.h b/src/quicktemplates2/qquickbusyindicator_p.h index bca074cc..4da2c152 100644 --- a/src/quicktemplates2/qquickbusyindicator_p.h +++ b/src/quicktemplates2/qquickbusyindicator_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickBusyIndicatorPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickBusyIndicator : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickBusyIndicator : public QQuickControl { Q_OBJECT Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged FINAL) diff --git a/src/quicktemplates2/qquickbutton_p.h b/src/quicktemplates2/qquickbutton_p.h index 90aa5176..a98bbe78 100644 --- a/src/quicktemplates2/qquickbutton_p.h +++ b/src/quicktemplates2/qquickbutton_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES2_EXPORT QQuickButton : public QQuickAbstractButton +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButton : public QQuickAbstractButton { Q_OBJECT Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL) diff --git a/src/quicktemplates2/qquickbuttongroup_p.h b/src/quicktemplates2/qquickbuttongroup_p.h index a3ca0887..707b8aa4 100644 --- a/src/quicktemplates2/qquickbuttongroup_p.h +++ b/src/quicktemplates2/qquickbuttongroup_p.h @@ -59,7 +59,7 @@ class QQuickButtonGroupPrivate; class QQuickButtonGroupAttached; class QQuickButtonGroupAttachedPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickButtonGroup : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButtonGroup : public QObject { Q_OBJECT Q_PROPERTY(QQuickAbstractButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged) @@ -91,7 +91,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_updateCurrent()) }; -class Q_QUICKTEMPLATES2_EXPORT QQuickButtonGroupAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButtonGroupAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickButtonGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL) diff --git a/src/quicktemplates2/qquickcheckbox_p.h b/src/quicktemplates2/qquickcheckbox_p.h index c8c03614..bee3bae4 100644 --- a/src/quicktemplates2/qquickcheckbox_p.h +++ b/src/quicktemplates2/qquickcheckbox_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickCheckBoxPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickCheckBox : public QQuickAbstractButton +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickCheckBox : public QQuickAbstractButton { Q_OBJECT Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL) diff --git a/src/quicktemplates2/qquickcheckdelegate_p.h b/src/quicktemplates2/qquickcheckdelegate_p.h index 10b10488..d0509512 100644 --- a/src/quicktemplates2/qquickcheckdelegate_p.h +++ b/src/quicktemplates2/qquickcheckdelegate_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickCheckDelegatePrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickCheckDelegate : public QQuickItemDelegate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickCheckDelegate : public QQuickItemDelegate { Q_OBJECT Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL) diff --git a/src/quicktemplates2/qquickcombobox_p.h b/src/quicktemplates2/qquickcombobox_p.h index 60614f72..ab0b7f10 100644 --- a/src/quicktemplates2/qquickcombobox_p.h +++ b/src/quicktemplates2/qquickcombobox_p.h @@ -56,7 +56,7 @@ class QQuickPopup; class QQmlInstanceModel; class QQuickComboBoxPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickComboBox : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickComboBox : public QQuickControl { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged FINAL) diff --git a/src/quicktemplates2/qquickcontainer_p.h b/src/quicktemplates2/qquickcontainer_p.h index 949bf859..2ed30b77 100644 --- a/src/quicktemplates2/qquickcontainer_p.h +++ b/src/quicktemplates2/qquickcontainer_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickContainerPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickContainer : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainer : public QQuickControl { Q_OBJECT Q_PROPERTY(int count READ count NOTIFY countChanged FINAL) diff --git a/src/quicktemplates2/qquickcontainer_p_p.h b/src/quicktemplates2/qquickcontainer_p_p.h index 8ea901b7..30076a31 100644 --- a/src/quicktemplates2/qquickcontainer_p_p.h +++ b/src/quicktemplates2/qquickcontainer_p_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES2_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickContainer) diff --git a/src/quicktemplates2/qquickcontrol_p.h b/src/quicktemplates2/qquickcontrol_p.h index ffff75b4..9027743a 100644 --- a/src/quicktemplates2/qquickcontrol_p.h +++ b/src/quicktemplates2/qquickcontrol_p.h @@ -56,7 +56,7 @@ QT_BEGIN_NAMESPACE class QQuickControlPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickControl : public QQuickItem +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControl : public QQuickItem { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h index 6e934a17..d36b8f9e 100644 --- a/src/quicktemplates2/qquickcontrol_p_p.h +++ b/src/quicktemplates2/qquickcontrol_p_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QQuickAccessibleAttached; -class Q_QUICKTEMPLATES2_EXPORT QQuickControlPrivate : public QQuickItemPrivate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemPrivate #ifndef QT_NO_ACCESSIBILITY , public QAccessible::ActivationObserver #endif diff --git a/src/quicktemplates2/qquickdial_p.h b/src/quicktemplates2/qquickdial_p.h index f736e607..b2823629 100644 --- a/src/quicktemplates2/qquickdial_p.h +++ b/src/quicktemplates2/qquickdial_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QQuickDialAttached; class QQuickDialPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickDial : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDial : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) diff --git a/src/quicktemplates2/qquickdrawer_p.h b/src/quicktemplates2/qquickdrawer_p.h index 5dd9d974..23c5c2ab 100644 --- a/src/quicktemplates2/qquickdrawer_p.h +++ b/src/quicktemplates2/qquickdrawer_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickDrawerPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickDrawer : public QQuickPopup +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDrawer : public QQuickPopup { Q_OBJECT Q_PROPERTY(Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged FINAL) diff --git a/src/quicktemplates2/qquickframe_p.h b/src/quicktemplates2/qquickframe_p.h index 55ecbe5d..12a65afd 100644 --- a/src/quicktemplates2/qquickframe_p.h +++ b/src/quicktemplates2/qquickframe_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickFramePrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickFrame : public QQuickPane +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickFrame : public QQuickPane { Q_OBJECT diff --git a/src/quicktemplates2/qquickframe_p_p.h b/src/quicktemplates2/qquickframe_p_p.h index 204bd0a4..6939be6c 100644 --- a/src/quicktemplates2/qquickframe_p_p.h +++ b/src/quicktemplates2/qquickframe_p_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickFrame; -class Q_QUICKTEMPLATES2_EXPORT QQuickFramePrivate : public QQuickPanePrivate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickFramePrivate : public QQuickPanePrivate { }; diff --git a/src/quicktemplates2/qquickgroupbox_p.h b/src/quicktemplates2/qquickgroupbox_p.h index 778ae243..0f1bdc54 100644 --- a/src/quicktemplates2/qquickgroupbox_p.h +++ b/src/quicktemplates2/qquickgroupbox_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickGroupBoxPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickGroupBox : public QQuickFrame +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickGroupBox : public QQuickFrame { Q_OBJECT Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) diff --git a/src/quicktemplates2/qquickitemdelegate_p.h b/src/quicktemplates2/qquickitemdelegate_p.h index 3e1cec5e..205407a0 100644 --- a/src/quicktemplates2/qquickitemdelegate_p.h +++ b/src/quicktemplates2/qquickitemdelegate_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES2_EXPORT QQuickItemDelegate : public QQuickAbstractButton +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickItemDelegate : public QQuickAbstractButton { Q_OBJECT diff --git a/src/quicktemplates2/qquicklabel_p.h b/src/quicktemplates2/qquicklabel_p.h index 618da6b9..bae4d296 100644 --- a/src/quicktemplates2/qquicklabel_p.h +++ b/src/quicktemplates2/qquicklabel_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickLabelPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickLabel : public QQuickText +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickLabel : public QQuickText { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override diff --git a/src/quicktemplates2/qquickmenu_p.h b/src/quicktemplates2/qquickmenu_p.h index e41fa067..3a815b41 100644 --- a/src/quicktemplates2/qquickmenu_p.h +++ b/src/quicktemplates2/qquickmenu_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QQuickMenuItem; class QQuickMenuPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickMenu : public QQuickPopup +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenu : public QQuickPopup { Q_OBJECT Q_PROPERTY(QVariant contentModel READ contentModel CONSTANT FINAL) diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h index d77ebea9..64260508 100644 --- a/src/quicktemplates2/qquickmenu_p_p.h +++ b/src/quicktemplates2/qquickmenu_p_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QQmlObjectModel; -class Q_QUICKTEMPLATES2_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate, public QQuickItemChangeListener +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate, public QQuickItemChangeListener { Q_DECLARE_PUBLIC(QQuickMenu) diff --git a/src/quicktemplates2/qquickmenuitem_p.h b/src/quicktemplates2/qquickmenuitem_p.h index 42901f42..b99fdef3 100644 --- a/src/quicktemplates2/qquickmenuitem_p.h +++ b/src/quicktemplates2/qquickmenuitem_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickMenuItemPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickMenuItem : public QQuickAbstractButton +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuItem : public QQuickAbstractButton { Q_OBJECT Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable NOTIFY checkableChanged FINAL) diff --git a/src/quicktemplates2/qquickoverlay_p.h b/src/quicktemplates2/qquickoverlay_p.h index 4b6cb9c7..77137257 100644 --- a/src/quicktemplates2/qquickoverlay_p.h +++ b/src/quicktemplates2/qquickoverlay_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickOverlayPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickOverlay : public QQuickItem +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickOverlay : public QQuickItem { Q_OBJECT Q_PROPERTY(QQuickItem *modal READ modal WRITE setModal NOTIFY modalChanged FINAL) diff --git a/src/quicktemplates2/qquickpage_p.h b/src/quicktemplates2/qquickpage_p.h index be6bffae..2cb77378 100644 --- a/src/quicktemplates2/qquickpage_p.h +++ b/src/quicktemplates2/qquickpage_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickPagePrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickPage : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPage : public QQuickControl { Q_OBJECT Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL) diff --git a/src/quicktemplates2/qquickpageindicator_p.h b/src/quicktemplates2/qquickpageindicator_p.h index 5c8b1e99..b5833835 100644 --- a/src/quicktemplates2/qquickpageindicator_p.h +++ b/src/quicktemplates2/qquickpageindicator_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQmlComponent; class QQuickPageIndicatorPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickPageIndicator : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPageIndicator : public QQuickControl { Q_OBJECT Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL) diff --git a/src/quicktemplates2/qquickpane_p.h b/src/quicktemplates2/qquickpane_p.h index 249b9643..95834bdc 100644 --- a/src/quicktemplates2/qquickpane_p.h +++ b/src/quicktemplates2/qquickpane_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickPanePrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickPane : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPane : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth NOTIFY contentWidthChanged FINAL) diff --git a/src/quicktemplates2/qquickpane_p_p.h b/src/quicktemplates2/qquickpane_p_p.h index 7dba6d25..acc0d0ab 100644 --- a/src/quicktemplates2/qquickpane_p_p.h +++ b/src/quicktemplates2/qquickpane_p_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickPane; -class Q_QUICKTEMPLATES2_EXPORT QQuickPanePrivate : public QQuickControlPrivate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPanePrivate : public QQuickControlPrivate { Q_DECLARE_PUBLIC(QQuickPane) diff --git a/src/quicktemplates2/qquickpopup_p.h b/src/quicktemplates2/qquickpopup_p.h index 27123ae5..c0bb3426 100644 --- a/src/quicktemplates2/qquickpopup_p.h +++ b/src/quicktemplates2/qquickpopup_p.h @@ -69,7 +69,7 @@ class QQuickWindow; class QQuickPopupPrivate; class QQuickTransition; -class Q_QUICKTEMPLATES2_EXPORT QQuickPopup : public QObject, public QQmlParserStatus +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQmlParserStatus { Q_OBJECT Q_INTERFACES(QQmlParserStatus) diff --git a/src/quicktemplates2/qquickprogressbar_p.h b/src/quicktemplates2/qquickprogressbar_p.h index f9f1c695..82adee77 100644 --- a/src/quicktemplates2/qquickprogressbar_p.h +++ b/src/quicktemplates2/qquickprogressbar_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickProgressBarPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickProgressBar : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickProgressBar : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) diff --git a/src/quicktemplates2/qquickradiobutton_p.h b/src/quicktemplates2/qquickradiobutton_p.h index 1adfcab9..c9d9d8ea 100644 --- a/src/quicktemplates2/qquickradiobutton_p.h +++ b/src/quicktemplates2/qquickradiobutton_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES2_EXPORT QQuickRadioButton : public QQuickAbstractButton +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRadioButton : public QQuickAbstractButton { Q_OBJECT diff --git a/src/quicktemplates2/qquickradiodelegate_p.h b/src/quicktemplates2/qquickradiodelegate_p.h index b5de6aa6..3f231fd7 100644 --- a/src/quicktemplates2/qquickradiodelegate_p.h +++ b/src/quicktemplates2/qquickradiodelegate_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickRadioDelegatePrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickRadioDelegate : public QQuickItemDelegate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRadioDelegate : public QQuickItemDelegate { Q_OBJECT diff --git a/src/quicktemplates2/qquickrangeslider_p.h b/src/quicktemplates2/qquickrangeslider_p.h index a64ade26..d6a8a7a5 100644 --- a/src/quicktemplates2/qquickrangeslider_p.h +++ b/src/quicktemplates2/qquickrangeslider_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickRangeSliderPrivate; class QQuickRangeSliderNode; -class Q_QUICKTEMPLATES2_EXPORT QQuickRangeSlider : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRangeSlider : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) @@ -127,7 +127,7 @@ private: class QQuickRangeSliderNodePrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickRangeSliderNode : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRangeSliderNode : public QObject { Q_OBJECT Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged FINAL) diff --git a/src/quicktemplates2/qquickscrollbar_p.h b/src/quicktemplates2/qquickscrollbar_p.h index 26b0d29b..8feba604 100644 --- a/src/quicktemplates2/qquickscrollbar_p.h +++ b/src/quicktemplates2/qquickscrollbar_p.h @@ -56,7 +56,7 @@ class QQuickFlickable; class QQuickScrollBarAttached; class QQuickScrollBarPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickScrollBar : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_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_QUICKTEMPLATES2_EXPORT QQuickScrollBarAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollBarAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickScrollBar *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL) diff --git a/src/quicktemplates2/qquickscrollindicator_p.h b/src/quicktemplates2/qquickscrollindicator_p.h index 183ef99e..1e120928 100644 --- a/src/quicktemplates2/qquickscrollindicator_p.h +++ b/src/quicktemplates2/qquickscrollindicator_p.h @@ -56,7 +56,7 @@ class QQuickFlickable; class QQuickScrollIndicatorAttached; class QQuickScrollIndicatorPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickScrollIndicator : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollIndicator : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL) @@ -100,7 +100,7 @@ private: class QQuickScrollIndicatorAttachedPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickScrollIndicatorAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollIndicatorAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickScrollIndicator *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL) diff --git a/src/quicktemplates2/qquickslider_p.h b/src/quicktemplates2/qquickslider_p.h index 6cb550fd..f6c1401a 100644 --- a/src/quicktemplates2/qquickslider_p.h +++ b/src/quicktemplates2/qquickslider_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickSliderPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickSlider : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSlider : public QQuickControl { Q_OBJECT Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL) diff --git a/src/quicktemplates2/qquickspinbox_p.h b/src/quicktemplates2/qquickspinbox_p.h index c4810105..5dd7b57d 100644 --- a/src/quicktemplates2/qquickspinbox_p.h +++ b/src/quicktemplates2/qquickspinbox_p.h @@ -58,7 +58,7 @@ class QQuickSpinButton; class QQuickSpinButtonPrivate; class QQuickSpinBoxPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickSpinBox : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSpinBox : public QQuickControl { Q_OBJECT Q_PROPERTY(int from READ from WRITE setFrom NOTIFY fromChanged FINAL) @@ -141,7 +141,7 @@ private: Q_DECLARE_PRIVATE(QQuickSpinBox) }; -class Q_QUICKTEMPLATES2_EXPORT QQuickSpinButton : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSpinButton : public QObject { Q_OBJECT Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL) diff --git a/src/quicktemplates2/qquickstackview_p.h b/src/quicktemplates2/qquickstackview_p.h index ed762645..5c119627 100644 --- a/src/quicktemplates2/qquickstackview_p.h +++ b/src/quicktemplates2/qquickstackview_p.h @@ -58,7 +58,7 @@ class QQuickStackElement; class QQuickStackAttached; class QQuickStackViewPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickStackView : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackView : public QQuickControl { Q_OBJECT Q_PROPERTY(bool busy READ isBusy NOTIFY busyChanged FINAL) @@ -156,7 +156,7 @@ private: class QQuickStackAttachedPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickStackAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackAttached : public QObject { Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) diff --git a/src/quicktemplates2/qquickswipedelegate_p.h b/src/quicktemplates2/qquickswipedelegate_p.h index 616ca355..fe4fd05d 100644 --- a/src/quicktemplates2/qquickswipedelegate_p.h +++ b/src/quicktemplates2/qquickswipedelegate_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickSwipeDelegatePrivate; class QQuickSwipeExposure; -class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeDelegate : public QQuickItemDelegate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeDelegate : public QQuickItemDelegate { Q_OBJECT Q_PROPERTY(QQuickSwipeExposure *exposure READ exposure CONSTANT) @@ -84,7 +84,7 @@ private: class QQuickSwipeExposurePrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeExposure : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeExposure : public QObject { Q_OBJECT Q_PROPERTY(qreal position READ position NOTIFY positionChanged FINAL) diff --git a/src/quicktemplates2/qquickswipeview_p.h b/src/quicktemplates2/qquickswipeview_p.h index 885d5e07..49d3b840 100644 --- a/src/quicktemplates2/qquickswipeview_p.h +++ b/src/quicktemplates2/qquickswipeview_p.h @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE class QQuickSwipeViewAttached; class QQuickSwipeViewPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeView : public QQuickContainer +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeView : public QQuickContainer { Q_OBJECT @@ -75,7 +75,7 @@ private: class QQuickSwipeViewAttachedPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeViewAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeViewAttached : public QObject { Q_OBJECT Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL) diff --git a/src/quicktemplates2/qquickswitch_p.h b/src/quicktemplates2/qquickswitch_p.h index 9163af1c..fa92e9f3 100644 --- a/src/quicktemplates2/qquickswitch_p.h +++ b/src/quicktemplates2/qquickswitch_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickSwitchPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickSwitch : public QQuickAbstractButton +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwitch : public QQuickAbstractButton { Q_OBJECT Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL) diff --git a/src/quicktemplates2/qquickswitchdelegate_p.h b/src/quicktemplates2/qquickswitchdelegate_p.h index af931863..5126f643 100644 --- a/src/quicktemplates2/qquickswitchdelegate_p.h +++ b/src/quicktemplates2/qquickswitchdelegate_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickSwitchDelegatePrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickSwitchDelegate : public QQuickItemDelegate +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwitchDelegate : public QQuickItemDelegate { Q_OBJECT Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL) diff --git a/src/quicktemplates2/qquicktabbar_p.h b/src/quicktemplates2/qquicktabbar_p.h index 9f18d105..7e590009 100644 --- a/src/quicktemplates2/qquicktabbar_p.h +++ b/src/quicktemplates2/qquicktabbar_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickTabBarPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickTabBar : public QQuickContainer +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabBar : public QQuickContainer { Q_OBJECT Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL) diff --git a/src/quicktemplates2/qquicktabbutton_p.h b/src/quicktemplates2/qquicktabbutton_p.h index 5d3c5907..951a02b2 100644 --- a/src/quicktemplates2/qquicktabbutton_p.h +++ b/src/quicktemplates2/qquicktabbutton_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES2_EXPORT QQuickTabButton : public QQuickAbstractButton +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabButton : public QQuickAbstractButton { Q_OBJECT diff --git a/src/quicktemplates2/qquicktextarea_p.h b/src/quicktemplates2/qquicktextarea_p.h index 7c145a9a..84dd86d6 100644 --- a/src/quicktemplates2/qquicktextarea_p.h +++ b/src/quicktemplates2/qquicktextarea_p.h @@ -58,7 +58,7 @@ class QQuickTextAreaPrivate; class QQuickTextAreaAttached; class QQuickMouseEvent; -class Q_QUICKTEMPLATES2_EXPORT QQuickTextArea : public QQuickTextEdit +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override @@ -116,7 +116,7 @@ private: class QQuickTextAreaAttachedPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickTextAreaAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextAreaAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickTextArea *flickable READ flickable WRITE setFlickable NOTIFY flickableChanged FINAL) diff --git a/src/quicktemplates2/qquicktextfield_p.h b/src/quicktemplates2/qquicktextfield_p.h index fe5a92eb..8953756e 100644 --- a/src/quicktemplates2/qquicktextfield_p.h +++ b/src/quicktemplates2/qquicktextfield_p.h @@ -57,7 +57,7 @@ class QQuickText; class QQuickTextFieldPrivate; class QQuickMouseEvent; -class Q_QUICKTEMPLATES2_EXPORT QQuickTextField : public QQuickTextInput +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextField : public QQuickTextInput { Q_OBJECT Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override diff --git a/src/quicktemplates2/qquicktoolbar_p.h b/src/quicktemplates2/qquicktoolbar_p.h index 8e548a53..be0cf666 100644 --- a/src/quicktemplates2/qquicktoolbar_p.h +++ b/src/quicktemplates2/qquicktoolbar_p.h @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE class QQuickToolBarPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickToolBar : public QQuickFrame +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolBar : public QQuickFrame { Q_OBJECT Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL) diff --git a/src/quicktemplates2/qquicktoolbutton_p.h b/src/quicktemplates2/qquicktoolbutton_p.h index 8be587ca..0041e9c9 100644 --- a/src/quicktemplates2/qquicktoolbutton_p.h +++ b/src/quicktemplates2/qquicktoolbutton_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE -class Q_QUICKTEMPLATES2_EXPORT QQuickToolButton : public QQuickButton +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolButton : public QQuickButton { Q_OBJECT diff --git a/src/quicktemplates2/qquicktooltip_p.h b/src/quicktemplates2/qquicktooltip_p.h index 47076d4f..227c6a4e 100644 --- a/src/quicktemplates2/qquicktooltip_p.h +++ b/src/quicktemplates2/qquicktooltip_p.h @@ -56,7 +56,7 @@ class QQuickToolTipPrivate; class QQuickToolTipAttached; class QQuickToolTipAttachedPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickToolTip : public QQuickPopup +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolTip : public QQuickPopup { Q_OBJECT Q_PROPERTY(int delay READ delay WRITE setDelay NOTIFY delayChanged FINAL) @@ -101,7 +101,7 @@ private: Q_DECLARE_PRIVATE(QQuickToolTip) }; -class Q_QUICKTEMPLATES2_EXPORT QQuickToolTipAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolTipAttached : public QObject { Q_OBJECT Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL) diff --git a/src/quicktemplates2/qquicktumbler_p.h b/src/quicktemplates2/qquicktumbler_p.h index a57710c2..05f24c8b 100644 --- a/src/quicktemplates2/qquicktumbler_p.h +++ b/src/quicktemplates2/qquicktumbler_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE class QQuickTumblerAttached; class QQuickTumblerPrivate; -class Q_QUICKTEMPLATES2_EXPORT QQuickTumbler : public QQuickControl +class Q_QUICKTEMPLATES2_PRIVATE_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_QUICKTEMPLATES2_EXPORT QQuickTumblerAttached : public QObject +class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerAttached : public QObject { Q_OBJECT Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT) diff --git a/src/quicktemplates2/qtquicktemplates2global_p.h b/src/quicktemplates2/qtquicktemplates2global_p.h index 38919795..717bcb5c 100644 --- a/src/quicktemplates2/qtquicktemplates2global_p.h +++ b/src/quicktemplates2/qtquicktemplates2global_p.h @@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE #ifndef QT_STATIC # if defined(QT_BUILD_QUICKTEMPLATES2_LIB) -# define Q_QUICKTEMPLATES2_EXPORT Q_DECL_EXPORT +# define Q_QUICKTEMPLATES2_PRIVATE_EXPORT Q_DECL_EXPORT # else -# define Q_QUICKTEMPLATES2_EXPORT Q_DECL_IMPORT +# define Q_QUICKTEMPLATES2_PRIVATE_EXPORT Q_DECL_IMPORT # endif #else -# define Q_QUICKTEMPLATES2_EXPORT +# define Q_QUICKTEMPLATES2_PRIVATE_EXPORT #endif QT_END_NAMESPACE -- cgit v1.2.3