Remove the use of Q_QUICKTEMPLATES2_PRIVATE_EXPORT

Task-number: QTBUG-117983
Change-Id: Ie8e0cf7d4b891e97f5624401da78a1b6e8eb9fd0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

91 files changed, 117 insertions, 117 deletions

diff --git a/src/quicktemplates/qquickabstractbutton_p.h b/src/quicktemplates/qquickabstractbutton_p.h
index 0ba23c55e4..0ac27db156 100644
--- a/src/quicktemplates/qquickabstractbutton_p.h
+++ b/src/quicktemplates/qquickabstractbutton_p.h
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
 class QQuickAction;
 class QQuickAbstractButtonPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButton : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickAbstractButton : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText RESET resetText NOTIFY textChanged FINAL)
diff --git a/src/quicktemplates/qquickabstractbutton_p_p.h b/src/quicktemplates/qquickabstractbutton_p_p.h
index e03b28fe82..4c3bddda06 100644
--- a/src/quicktemplates/qquickabstractbutton_p_p.h
+++ b/src/quicktemplates/qquickabstractbutton_p_p.h
@@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE
 class QQuickAction;
 class QQuickButtonGroup;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButtonPrivate : public QQuickControlPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickAbstractButtonPrivate : public QQuickControlPrivate
 {
 public:
     Q_DECLARE_PUBLIC(QQuickAbstractButton)
diff --git a/src/quicktemplates/qquickaction_p.h b/src/quicktemplates/qquickaction_p.h
index 975068687f..db985f750d 100644
--- a/src/quicktemplates/qquickaction_p.h
+++ b/src/quicktemplates/qquickaction_p.h
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 class QQuickIcon;
 class QQuickActionPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAction : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickAction : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
diff --git a/src/quicktemplates/qquickactiongroup_p.h b/src/quicktemplates/qquickactiongroup_p.h
index 5b80cca6e3..1dd19df1e8 100644
--- a/src/quicktemplates/qquickactiongroup_p.h
+++ b/src/quicktemplates/qquickactiongroup_p.h
@@ -26,7 +26,7 @@ class QQuickActionGroupPrivate;
 class QQuickActionGroupAttached;
 class QQuickActionGroupAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickActionGroup : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickActionGroup : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickAction *checkedAction READ checkedAction WRITE setCheckedAction NOTIFY checkedActionChanged FINAL)
@@ -73,7 +73,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_updateCurrent())
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickActionGroupAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickActionGroupAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickActionGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL)
diff --git a/src/quicktemplates/qquickapplicationwindow.cpp b/src/quicktemplates/qquickapplicationwindow.cpp
index 73ea50a075..3e82e11c61 100644
--- a/src/quicktemplates/qquickapplicationwindow.cpp
+++ b/src/quicktemplates/qquickapplicationwindow.cpp
@@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE
 static const QQuickItemPrivate::ChangeTypes ItemChanges = QQuickItemPrivate::Visibility
         | QQuickItemPrivate::Geometry | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindowPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickApplicationWindowPrivate
     : public QQuickWindowQmlImplPrivate
     , public QQuickItemChangeListener
 {
diff --git a/src/quicktemplates/qquickapplicationwindow_p.h b/src/quicktemplates/qquickapplicationwindow_p.h
index a877642111..23a3a197ac 100644
--- a/src/quicktemplates/qquickapplicationwindow_p.h
+++ b/src/quicktemplates/qquickapplicationwindow_p.h
@@ -27,7 +27,7 @@ class QQuickApplicationWindowPrivate;
 class QQuickApplicationWindowAttached;
 class QQuickApplicationWindowAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
+class Q_QUICKTEMPLATES2_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImpl
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *background READ background WRITE setBackground NOTIFY backgroundChanged FINAL)
@@ -99,7 +99,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_updateActiveFocus())
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindowAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickApplicationWindowAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickApplicationWindow *window READ window NOTIFY windowChanged FINAL)
diff --git a/src/quicktemplates/qquickbusyindicator_p.h b/src/quicktemplates/qquickbusyindicator_p.h
index a122284b19..357d327eb8 100644
--- a/src/quicktemplates/qquickbusyindicator_p.h
+++ b/src/quicktemplates/qquickbusyindicator_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickBusyIndicatorPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickBusyIndicator : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickBusyIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged FINAL)
diff --git a/src/quicktemplates/qquickbutton_p.h b/src/quicktemplates/qquickbutton_p.h
index 65b33bac3c..32ebeb563d 100644
--- a/src/quicktemplates/qquickbutton_p.h
+++ b/src/quicktemplates/qquickbutton_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickButtonPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButton : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickButton : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL)
diff --git a/src/quicktemplates/qquickbuttongroup_p.h b/src/quicktemplates/qquickbuttongroup_p.h
index 5cd28c4205..a7ac05b01f 100644
--- a/src/quicktemplates/qquickbuttongroup_p.h
+++ b/src/quicktemplates/qquickbuttongroup_p.h
@@ -27,7 +27,7 @@ class QQuickButtonGroupPrivate;
 class QQuickButtonGroupAttached;
 class QQuickButtonGroupAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButtonGroup : public QObject, public QQmlParserStatus
+class Q_QUICKTEMPLATES2_EXPORT QQuickButtonGroup : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_PROPERTY(QQuickAbstractButton *checkedButton READ checkedButton WRITE setCheckedButton NOTIFY checkedButtonChanged FINAL)
@@ -84,7 +84,7 @@ private:
     Q_PRIVATE_SLOT(d_func(), void _q_updateCurrent())
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickButtonGroupAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickButtonGroupAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickButtonGroup *group READ group WRITE setGroup NOTIFY groupChanged FINAL)
diff --git a/src/quicktemplates/qquickcheckbox_p.h b/src/quicktemplates/qquickcheckbox_p.h
index 3d36379bce..b1a779dacd 100644
--- a/src/quicktemplates/qquickcheckbox_p.h
+++ b/src/quicktemplates/qquickcheckbox_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickCheckBoxPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickCheckBox : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickCheckBox : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL)
diff --git a/src/quicktemplates/qquickcheckdelegate_p.h b/src/quicktemplates/qquickcheckdelegate_p.h
index 220761dce1..8e40ef68e7 100644
--- a/src/quicktemplates/qquickcheckdelegate_p.h
+++ b/src/quicktemplates/qquickcheckdelegate_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickCheckDelegatePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickCheckDelegate : public QQuickItemDelegate
+class Q_QUICKTEMPLATES2_EXPORT QQuickCheckDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
     Q_PROPERTY(bool tristate READ isTristate WRITE setTristate NOTIFY tristateChanged FINAL)
diff --git a/src/quicktemplates/qquickcombobox_p.h b/src/quicktemplates/qquickcombobox_p.h
index 874460c188..2ef5dc776c 100644
--- a/src/quicktemplates/qquickcombobox_p.h
+++ b/src/quicktemplates/qquickcombobox_p.h
@@ -30,7 +30,7 @@ class QQuickPopup;
 class QQmlInstanceModel;
 class QQuickComboBoxPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickComboBox : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickComboBox : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
diff --git a/src/quicktemplates/qquickcontainer_p.h b/src/quicktemplates/qquickcontainer_p.h
index 51bfaf6e7c..7a71d5bdf6 100644
--- a/src/quicktemplates/qquickcontainer_p.h
+++ b/src/quicktemplates/qquickcontainer_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickContainerPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainer : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickContainer : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
diff --git a/src/quicktemplates/qquickcontainer_p_p.h b/src/quicktemplates/qquickcontainer_p_p.h
index 84fe62a75d..a486e8cba7 100644
--- a/src/quicktemplates/qquickcontainer_p_p.h
+++ b/src/quicktemplates/qquickcontainer_p_p.h
@@ -21,7 +21,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainerPrivate : public QQuickControlPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickContainerPrivate : public QQuickControlPrivate
 {
 public:
     Q_DECLARE_PUBLIC(QQuickContainer)
diff --git a/src/quicktemplates/qquickcontentitem_p.h b/src/quicktemplates/qquickcontentitem_p.h
index 446489ee70..77f7f14c64 100644
--- a/src/quicktemplates/qquickcontentitem_p.h
+++ b/src/quicktemplates/qquickcontentitem_p.h
@@ -20,7 +20,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContentItem : public QQuickItem
+class Q_QUICKTEMPLATES2_EXPORT QQuickContentItem : public QQuickItem
 {
     Q_OBJECT
 
diff --git a/src/quicktemplates/qquickcontrol_p.h b/src/quicktemplates/qquickcontrol_p.h
index 3ff73f7498..d9700a6b35 100644
--- a/src/quicktemplates/qquickcontrol_p.h
+++ b/src/quicktemplates/qquickcontrol_p.h
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickControlPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControl : public QQuickItem
+class Q_QUICKTEMPLATES2_EXPORT QQuickControl : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL)
diff --git a/src/quicktemplates/qquickcontrol_p_p.h b/src/quicktemplates/qquickcontrol_p_p.h
index 3dcf88d506..c58ee33ede 100644
--- a/src/quicktemplates/qquickcontrol_p_p.h
+++ b/src/quicktemplates/qquickcontrol_p_p.h
@@ -35,7 +35,7 @@ Q_DECLARE_LOGGING_CATEGORY(lcItemManagement)
 
 class QQuickAccessibleAttached;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
+class Q_QUICKTEMPLATES2_EXPORT QQuickControlPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
 #if QT_CONFIG(accessibility)
     , public QAccessible::ActivationObserver
 #endif
diff --git a/src/quicktemplates/qquickdeferredexecute_p_p.h b/src/quicktemplates/qquickdeferredexecute_p_p.h
index beecb3636b..31d0f887cf 100644
--- a/src/quicktemplates/qquickdeferredexecute_p_p.h
+++ b/src/quicktemplates/qquickdeferredexecute_p_p.h
@@ -27,9 +27,9 @@ class QString;
 class QObject;
 
 namespace QtQuickPrivate {
-    Q_QUICKTEMPLATES2_PRIVATE_EXPORT void beginDeferred(QObject *object, const QString &property, QQuickUntypedDeferredPointer *delegate, bool isOwnState);
-    Q_QUICKTEMPLATES2_PRIVATE_EXPORT void cancelDeferred(QObject *object, const QString &property);
-    Q_QUICKTEMPLATES2_PRIVATE_EXPORT void completeDeferred(QObject *object, const QString &property, QQuickUntypedDeferredPointer *delegate);
+    Q_QUICKTEMPLATES2_EXPORT void beginDeferred(QObject *object, const QString &property, QQuickUntypedDeferredPointer *delegate, bool isOwnState);
+    Q_QUICKTEMPLATES2_EXPORT void cancelDeferred(QObject *object, const QString &property);
+    Q_QUICKTEMPLATES2_EXPORT void completeDeferred(QObject *object, const QString &property, QQuickUntypedDeferredPointer *delegate);
 }
 
 template<typename T>
diff --git a/src/quicktemplates/qquickdelaybutton_p.h b/src/quicktemplates/qquickdelaybutton_p.h
index d082542007..3e648c4739 100644
--- a/src/quicktemplates/qquickdelaybutton_p.h
+++ b/src/quicktemplates/qquickdelaybutton_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 class QQuickTransition;
 class QQuickDelayButtonPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDelayButton : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickDelayButton : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(int delay READ delay WRITE setDelay NOTIFY delayChanged FINAL)
diff --git a/src/quicktemplates/qquickdial_p.h b/src/quicktemplates/qquickdial_p.h
index e80a8c813f..2008261214 100644
--- a/src/quicktemplates/qquickdial_p.h
+++ b/src/quicktemplates/qquickdial_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 class QQuickDialAttached;
 class QQuickDialPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDial : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickDial : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/quicktemplates/qquickdialog_p.h b/src/quicktemplates/qquickdialog_p.h
index 3c1a2dc5fe..63fac39f97 100644
--- a/src/quicktemplates/qquickdialog_p.h
+++ b/src/quicktemplates/qquickdialog_p.h
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickDialogPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialog : public QQuickPopup
+class Q_QUICKTEMPLATES2_EXPORT QQuickDialog : public QQuickPopup
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
diff --git a/src/quicktemplates/qquickdialog_p_p.h b/src/quicktemplates/qquickdialog_p_p.h
index 2d0121892a..dd4c3fa1f0 100644
--- a/src/quicktemplates/qquickdialog_p_p.h
+++ b/src/quicktemplates/qquickdialog_p_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 class QQuickAbstractButton;
 class QQuickDialogButtonBox;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogPrivate : public QQuickPopupPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickDialogPrivate : public QQuickPopupPrivate
 {
 public:
     Q_DECLARE_PUBLIC(QQuickDialog)
diff --git a/src/quicktemplates/qquickdialogbuttonbox_p.h b/src/quicktemplates/qquickdialogbuttonbox_p.h
index 570dc3fef9..73b0af9953 100644
--- a/src/quicktemplates/qquickdialogbuttonbox_p.h
+++ b/src/quicktemplates/qquickdialogbuttonbox_p.h
@@ -28,7 +28,7 @@ class QQuickDialogButtonBoxPrivate;
 class QQuickDialogButtonBoxAttached;
 class QQuickDialogButtonBoxAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogButtonBox : public QQuickContainer
+class Q_QUICKTEMPLATES2_EXPORT QQuickDialogButtonBox : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
@@ -107,7 +107,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickDialogButtonBox)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogButtonBoxAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickDialogButtonBoxAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickDialogButtonBox *buttonBox READ buttonBox NOTIFY buttonBoxChanged FINAL)
diff --git a/src/quicktemplates/qquickdialogbuttonbox_p_p.h b/src/quicktemplates/qquickdialogbuttonbox_p_p.h
index f2d9ff6b2d..b4b8af840f 100644
--- a/src/quicktemplates/qquickdialogbuttonbox_p_p.h
+++ b/src/quicktemplates/qquickdialogbuttonbox_p_p.h
@@ -20,7 +20,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogButtonBoxPrivate : public QQuickContainerPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickDialogButtonBoxPrivate : public QQuickContainerPrivate
 {
 public:
     Q_DECLARE_PUBLIC(QQuickDialogButtonBox)
diff --git a/src/quicktemplates/qquickdrawer_p.h b/src/quicktemplates/qquickdrawer_p.h
index 411a7f8d24..a8255e992e 100644
--- a/src/quicktemplates/qquickdrawer_p.h
+++ b/src/quicktemplates/qquickdrawer_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickDrawerPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDrawer : public QQuickPopup
+class Q_QUICKTEMPLATES2_EXPORT QQuickDrawer : public QQuickPopup
 {
     Q_OBJECT
     Q_PROPERTY(Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged FINAL)
diff --git a/src/quicktemplates/qquickframe_p.h b/src/quicktemplates/qquickframe_p.h
index 0c24907476..6500001fa6 100644
--- a/src/quicktemplates/qquickframe_p.h
+++ b/src/quicktemplates/qquickframe_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickFramePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickFrame : public QQuickPane
+class Q_QUICKTEMPLATES2_EXPORT QQuickFrame : public QQuickPane
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(Frame)
diff --git a/src/quicktemplates/qquickframe_p_p.h b/src/quicktemplates/qquickframe_p_p.h
index bb7eabf12a..8f882a26e4 100644
--- a/src/quicktemplates/qquickframe_p_p.h
+++ b/src/quicktemplates/qquickframe_p_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickFrame;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickFramePrivate : public QQuickPanePrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickFramePrivate : public QQuickPanePrivate
 {
 };
 
diff --git a/src/quicktemplates/qquickgroupbox_p.h b/src/quicktemplates/qquickgroupbox_p.h
index 8c73dcc8dd..0b2a5a0e52 100644
--- a/src/quicktemplates/qquickgroupbox_p.h
+++ b/src/quicktemplates/qquickgroupbox_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickGroupBoxPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickGroupBox : public QQuickFrame
+class Q_QUICKTEMPLATES2_EXPORT QQuickGroupBox : public QQuickFrame
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
diff --git a/src/quicktemplates/qquickheaderview_p.h b/src/quicktemplates/qquickheaderview_p.h
index 8ff68a9c0b..5280f563dc 100644
--- a/src/quicktemplates/qquickheaderview_p.h
+++ b/src/quicktemplates/qquickheaderview_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickHeaderViewBase;
 class QQuickHeaderViewBasePrivate;
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickHeaderViewBase : public QQuickTableView
+class Q_QUICKTEMPLATES2_EXPORT QQuickHeaderViewBase : public QQuickTableView
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickHeaderViewBase)
@@ -48,7 +48,7 @@ private:
 };
 
 class QQuickHorizontalHeaderViewPrivate;
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickHorizontalHeaderView : public QQuickHeaderViewBase
+class Q_QUICKTEMPLATES2_EXPORT QQuickHorizontalHeaderView : public QQuickHeaderViewBase
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickHorizontalHeaderView)
@@ -67,7 +67,7 @@ private:
 };
 
 class QQuickVerticalHeaderViewPrivate;
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickVerticalHeaderView : public QQuickHeaderViewBase
+class Q_QUICKTEMPLATES2_EXPORT QQuickVerticalHeaderView : public QQuickHeaderViewBase
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QQuickVerticalHeaderView)
diff --git a/src/quicktemplates/qquickheaderview_p_p.h b/src/quicktemplates/qquickheaderview_p_p.h
index 272228b05c..fa42e7ce30 100644
--- a/src/quicktemplates/qquickheaderview_p_p.h
+++ b/src/quicktemplates/qquickheaderview_p_p.h
@@ -25,7 +25,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QHeaderDataProxyModel : public QAbstractItemModel
+class Q_QUICKTEMPLATES2_EXPORT QHeaderDataProxyModel : public QAbstractItemModel
 {
     Q_OBJECT
     Q_DISABLE_COPY(QHeaderDataProxyModel)
diff --git a/src/quicktemplates/qquickicon_p.h b/src/quicktemplates/qquickicon_p.h
index 737b28ad89..5f513ea7d3 100644
--- a/src/quicktemplates/qquickicon_p.h
+++ b/src/quicktemplates/qquickicon_p.h
@@ -27,7 +27,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickIconPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickIcon
+class Q_QUICKTEMPLATES2_EXPORT QQuickIcon
 {
     Q_GADGET
     Q_PROPERTY(QString name READ name WRITE setName RESET resetName FINAL)
diff --git a/src/quicktemplates/qquickindicatorbutton_p.h b/src/quicktemplates/qquickindicatorbutton_p.h
index 5b5b09cfc5..98b08a6030 100644
--- a/src/quicktemplates/qquickindicatorbutton_p.h
+++ b/src/quicktemplates/qquickindicatorbutton_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickIndicatorButtonPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickIndicatorButton : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickIndicatorButton : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool pressed READ isPressed WRITE setPressed NOTIFY pressedChanged FINAL)
diff --git a/src/quicktemplates/qquickitemdelegate_p.h b/src/quicktemplates/qquickitemdelegate_p.h
index db58590d9b..8236410fb3 100644
--- a/src/quicktemplates/qquickitemdelegate_p.h
+++ b/src/quicktemplates/qquickitemdelegate_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickItemDelegatePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickItemDelegate : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickItemDelegate : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL)
diff --git a/src/quicktemplates/qquickitemdelegate_p_p.h b/src/quicktemplates/qquickitemdelegate_p_p.h
index f1af3daf94..cf223e6b8b 100644
--- a/src/quicktemplates/qquickitemdelegate_p_p.h
+++ b/src/quicktemplates/qquickitemdelegate_p_p.h
@@ -19,7 +19,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickItemDelegatePrivate : public QQuickAbstractButtonPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickItemDelegatePrivate : public QQuickAbstractButtonPrivate
 {
     Q_DECLARE_PUBLIC(QQuickItemDelegate)
 
diff --git a/src/quicktemplates/qquicklabel_p.h b/src/quicktemplates/qquicklabel_p.h
index 08939ab80e..bef65ee8ef 100644
--- a/src/quicktemplates/qquicklabel_p.h
+++ b/src/quicktemplates/qquicklabel_p.h
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickLabelPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickLabel : public QQuickText
+class Q_QUICKTEMPLATES2_EXPORT QQuickLabel : public QQuickText
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
diff --git a/src/quicktemplates/qquickmenu_p.h b/src/quicktemplates/qquickmenu_p.h
index 3ff51bff0c..da7fce80f8 100644
--- a/src/quicktemplates/qquickmenu_p.h
+++ b/src/quicktemplates/qquickmenu_p.h
@@ -31,7 +31,7 @@ class QQmlComponent;
 class QQuickMenuItem;
 class QQuickMenuPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenu : public QQuickPopup
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenu : public QQuickPopup
 {
     Q_OBJECT
     Q_PROPERTY(QVariant contentModel READ contentModel CONSTANT FINAL)
diff --git a/src/quicktemplates/qquickmenu_p_p.h b/src/quicktemplates/qquickmenu_p_p.h
index 509614d2d1..552f35794a 100644
--- a/src/quicktemplates/qquickmenu_p_p.h
+++ b/src/quicktemplates/qquickmenu_p_p.h
@@ -28,7 +28,7 @@ class QQmlComponent;
 class QQmlObjectModel;
 class QQuickMenuItem;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate
 {
 public:
     Q_DECLARE_PUBLIC(QQuickMenu)
diff --git a/src/quicktemplates/qquickmenubar_p.h b/src/quicktemplates/qquickmenubar_p.h
index e00da0d7c0..daa6bf362b 100644
--- a/src/quicktemplates/qquickmenubar_p.h
+++ b/src/quicktemplates/qquickmenubar_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 class QQuickMenu;
 class QQuickMenuBarPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuBar : public QQuickContainer
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuBar : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(QQmlComponent *delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL)
diff --git a/src/quicktemplates/qquickmenubar_p_p.h b/src/quicktemplates/qquickmenubar_p_p.h
index 15a370836d..f9a8acbd3d 100644
--- a/src/quicktemplates/qquickmenubar_p_p.h
+++ b/src/quicktemplates/qquickmenubar_p_p.h
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 class QQmlComponent;
 class QQuickMenuBarItem;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuBarPrivate : public QQuickContainerPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuBarPrivate : public QQuickContainerPrivate
 {
 public:
     Q_DECLARE_PUBLIC(QQuickMenuBar)
diff --git a/src/quicktemplates/qquickmenubaritem_p.h b/src/quicktemplates/qquickmenubaritem_p.h
index 128fb50cce..c101d1f580 100644
--- a/src/quicktemplates/qquickmenubaritem_p.h
+++ b/src/quicktemplates/qquickmenubaritem_p.h
@@ -25,7 +25,7 @@ class QQuickMenu;
 class QQuickMenuBar;
 class QQuickMenuBarItemPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuBarItem : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuBarItem : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(QQuickMenuBar *menuBar READ menuBar NOTIFY menuBarChanged FINAL)
diff --git a/src/quicktemplates/qquickmenuitem_p.h b/src/quicktemplates/qquickmenuitem_p.h
index 2586ee8c3c..fb99dc2502 100644
--- a/src/quicktemplates/qquickmenuitem_p.h
+++ b/src/quicktemplates/qquickmenuitem_p.h
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 class QQuickMenu;
 class QQuickMenuItemPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuItem : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuItem : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(bool highlighted READ isHighlighted WRITE setHighlighted NOTIFY highlightedChanged FINAL)
diff --git a/src/quicktemplates/qquickmenuseparator.cpp b/src/quicktemplates/qquickmenuseparator.cpp
index d9aa770ca5..0766151d1c 100644
--- a/src/quicktemplates/qquickmenuseparator.cpp
+++ b/src/quicktemplates/qquickmenuseparator.cpp
@@ -33,7 +33,7 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing Menu}, Menu, {Separator Controls}
 */
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuSeparatorPrivate : public QQuickControlPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuSeparatorPrivate : public QQuickControlPrivate
 {
     Q_DECLARE_PUBLIC(QQuickMenuSeparator)
 
diff --git a/src/quicktemplates/qquickmenuseparator_p.h b/src/quicktemplates/qquickmenuseparator_p.h
index e62753b1c2..ec7517ee90 100644
--- a/src/quicktemplates/qquickmenuseparator_p.h
+++ b/src/quicktemplates/qquickmenuseparator_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickMenuSeparator;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuSeparator : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickMenuSeparator : public QQuickControl
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(MenuSeparator)
diff --git a/src/quicktemplates/qquickoverlay_p.h b/src/quicktemplates/qquickoverlay_p.h
index 690afe8d90..16f0ba09db 100644
--- a/src/quicktemplates/qquickoverlay_p.h
+++ b/src/quicktemplates/qquickoverlay_p.h
@@ -25,7 +25,7 @@ class QQuickOverlayPrivate;
 class QQuickOverlayAttached;
 class QQuickOverlayAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickOverlay : public QQuickItem
+class Q_QUICKTEMPLATES2_EXPORT QQuickOverlay : public QQuickItem
 {
     Q_OBJECT
     Q_PROPERTY(QQmlComponent *modal READ modal WRITE setModal NOTIFY modalChanged FINAL)
@@ -76,7 +76,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickOverlay)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickOverlayAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickOverlayAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickOverlay *overlay READ overlay NOTIFY overlayChanged FINAL)
diff --git a/src/quicktemplates/qquickpage_p.h b/src/quicktemplates/qquickpage_p.h
index de9edb613d..02725cc7c5 100644
--- a/src/quicktemplates/qquickpage_p.h
+++ b/src/quicktemplates/qquickpage_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickPagePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPage : public QQuickPane
+class Q_QUICKTEMPLATES2_EXPORT QQuickPage : public QQuickPane
 {
     Q_OBJECT
     Q_PROPERTY(QString title READ title WRITE setTitle NOTIFY titleChanged FINAL)
diff --git a/src/quicktemplates/qquickpageindicator_p.h b/src/quicktemplates/qquickpageindicator_p.h
index e5743d2694..db4d83fad7 100644
--- a/src/quicktemplates/qquickpageindicator_p.h
+++ b/src/quicktemplates/qquickpageindicator_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 class QQmlComponent;
 class QQuickPageIndicatorPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPageIndicator : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickPageIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL)
diff --git a/src/quicktemplates/qquickpane_p.h b/src/quicktemplates/qquickpane_p.h
index 3ba14d59bb..a2a5cbbff6 100644
--- a/src/quicktemplates/qquickpane_p.h
+++ b/src/quicktemplates/qquickpane_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickPanePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPane : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickPane : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal contentWidth READ contentWidth WRITE setContentWidth RESET resetContentWidth NOTIFY contentWidthChanged FINAL)
diff --git a/src/quicktemplates/qquickpane_p_p.h b/src/quicktemplates/qquickpane_p_p.h
index e9964c70a0..71da80090a 100644
--- a/src/quicktemplates/qquickpane_p_p.h
+++ b/src/quicktemplates/qquickpane_p_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickPane;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPanePrivate : public QQuickControlPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickPanePrivate : public QQuickControlPrivate
 {
 public:
     Q_DECLARE_PUBLIC(QQuickPane)
diff --git a/src/quicktemplates/qquickpopup_p.h b/src/quicktemplates/qquickpopup_p.h
index 663b2b658b..9ffd94e70a 100644
--- a/src/quicktemplates/qquickpopup_p.h
+++ b/src/quicktemplates/qquickpopup_p.h
@@ -38,7 +38,7 @@ class QQuickPopupAnchors;
 class QQuickPopupPrivate;
 class QQuickTransition;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopup : public QObject, public QQmlParserStatus
+class Q_QUICKTEMPLATES2_EXPORT QQuickPopup : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
     Q_INTERFACES(QQmlParserStatus)
diff --git a/src/quicktemplates/qquickpopup_p_p.h b/src/quicktemplates/qquickpopup_p_p.h
index 381aaa5f40..5572dd87d1 100644
--- a/src/quicktemplates/qquickpopup_p_p.h
+++ b/src/quicktemplates/qquickpopup_p_p.h
@@ -37,7 +37,7 @@ class QQuickPopupItem;
 class QQuickPopupPrivate;
 class QQuickPopupPositioner;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupTransitionManager : public QQuickTransitionManager
+class Q_QUICKTEMPLATES2_EXPORT QQuickPopupTransitionManager : public QQuickTransitionManager
 {
 public:
     QQuickPopupTransitionManager(QQuickPopupPrivate *popup);
@@ -52,7 +52,7 @@ private:
     QQuickPopupPrivate *popup = nullptr;
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickPopupPrivate
     : public QObjectPrivate
     , public QQuickItemChangeListener
     , public QQuickPaletteProviderPrivateBase<QQuickPopup, QQuickPopupPrivate>
diff --git a/src/quicktemplates/qquickpopupanchors_p.h b/src/quicktemplates/qquickpopupanchors_p.h
index 2b1524c1fc..db94939673 100644
--- a/src/quicktemplates/qquickpopupanchors_p.h
+++ b/src/quicktemplates/qquickpopupanchors_p.h
@@ -26,7 +26,7 @@ class QQuickItem;
 class QQuickPopupAnchorsPrivate;
 class QQuickPopup;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupAnchors : public QObject, public QQuickItemChangeListener
+class Q_QUICKTEMPLATES2_EXPORT QQuickPopupAnchors : public QObject, public QQuickItemChangeListener
 {
     Q_OBJECT
     Q_PROPERTY(QQuickItem *centerIn READ centerIn WRITE setCenterIn RESET resetCenterIn NOTIFY centerInChanged FINAL)
diff --git a/src/quicktemplates/qquickpopupitem_p_p.h b/src/quicktemplates/qquickpopupitem_p_p.h
index b98970efb3..c0ef0f4d85 100644
--- a/src/quicktemplates/qquickpopupitem_p_p.h
+++ b/src/quicktemplates/qquickpopupitem_p_p.h
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
 class QQuickPopup;
 class QQuickPopupItemPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupItem : public QQuickPage
+class Q_QUICKTEMPLATES2_EXPORT QQuickPopupItem : public QQuickPage
 {
     Q_OBJECT
 
@@ -74,7 +74,7 @@ private:
     friend class QQuickPopup;
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupItemPrivate : public QQuickPagePrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickPopupItemPrivate : public QQuickPagePrivate
 {
     Q_DECLARE_PUBLIC(QQuickPopupItem)
 
diff --git a/src/quicktemplates/qquickpopuppositioner_p_p.h b/src/quicktemplates/qquickpopuppositioner_p_p.h
index c8e20b4b28..1ec8234469 100644
--- a/src/quicktemplates/qquickpopuppositioner_p_p.h
+++ b/src/quicktemplates/qquickpopuppositioner_p_p.h
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
 class QQuickItem;
 class QQuickPopup;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupPositioner : public QQuickItemChangeListener
+class Q_QUICKTEMPLATES2_EXPORT QQuickPopupPositioner : public QQuickItemChangeListener
 {
 public:
     explicit QQuickPopupPositioner(QQuickPopup *popup);
diff --git a/src/quicktemplates/qquickprogressbar_p.h b/src/quicktemplates/qquickprogressbar_p.h
index 3c7975a6e3..576515e4ad 100644
--- a/src/quicktemplates/qquickprogressbar_p.h
+++ b/src/quicktemplates/qquickprogressbar_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickProgressBarPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickProgressBar : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickProgressBar : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/quicktemplates/qquickradiobutton.cpp b/src/quicktemplates/qquickradiobutton.cpp
index a943da9de6..c49bf3b1cd 100644
--- a/src/quicktemplates/qquickradiobutton.cpp
+++ b/src/quicktemplates/qquickradiobutton.cpp
@@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE
     \sa ButtonGroup, {Customizing RadioButton}, {Button Controls}, RadioDelegate
 */
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRadioButtonPrivate : public QQuickAbstractButtonPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickRadioButtonPrivate : public QQuickAbstractButtonPrivate
 {
     Q_DECLARE_PUBLIC(QQuickRadioButton)
 
diff --git a/src/quicktemplates/qquickradiobutton_p.h b/src/quicktemplates/qquickradiobutton_p.h
index 105a2d68ce..d7f4c74c7b 100644
--- a/src/quicktemplates/qquickradiobutton_p.h
+++ b/src/quicktemplates/qquickradiobutton_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickRadioButtonPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRadioButton : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickRadioButton : public QQuickAbstractButton
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(RadioButton)
diff --git a/src/quicktemplates/qquickradiodelegate.cpp b/src/quicktemplates/qquickradiodelegate.cpp
index 2c390ad487..7ec22a6301 100644
--- a/src/quicktemplates/qquickradiodelegate.cpp
+++ b/src/quicktemplates/qquickradiodelegate.cpp
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
     \sa {Customizing RadioDelegate}, {Delegate Controls}, RadioButton
 */
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRadioDelegatePrivate : public QQuickItemDelegatePrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickRadioDelegatePrivate : public QQuickItemDelegatePrivate
 {
     Q_DECLARE_PUBLIC(QQuickRadioDelegate)
 
diff --git a/src/quicktemplates/qquickradiodelegate_p.h b/src/quicktemplates/qquickradiodelegate_p.h
index 1819e8ea0e..337711c73f 100644
--- a/src/quicktemplates/qquickradiodelegate_p.h
+++ b/src/quicktemplates/qquickradiodelegate_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickRadioDelegatePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRadioDelegate : public QQuickItemDelegate
+class Q_QUICKTEMPLATES2_EXPORT QQuickRadioDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(RadioDelegate)
diff --git a/src/quicktemplates/qquickrangeslider_p.h b/src/quicktemplates/qquickrangeslider_p.h
index 2064542292..772e4abcda 100644
--- a/src/quicktemplates/qquickrangeslider_p.h
+++ b/src/quicktemplates/qquickrangeslider_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 class QQuickRangeSliderPrivate;
 class QQuickRangeSliderNode;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRangeSlider : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickRangeSlider : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
@@ -126,7 +126,7 @@ private:
 
 class QQuickRangeSliderNodePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRangeSliderNode : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickRangeSliderNode : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal value READ value WRITE setValue NOTIFY valueChanged FINAL)
diff --git a/src/quicktemplates/qquickroundbutton_p.h b/src/quicktemplates/qquickroundbutton_p.h
index 1e30ea78bc..9a30ebe9a8 100644
--- a/src/quicktemplates/qquickroundbutton_p.h
+++ b/src/quicktemplates/qquickroundbutton_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickRoundButtonPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickRoundButton : public QQuickButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickRoundButton : public QQuickButton
 {
     Q_OBJECT
     Q_PROPERTY(qreal radius READ radius WRITE setRadius RESET resetRadius NOTIFY radiusChanged FINAL)
diff --git a/src/quicktemplates/qquickscrollbar_p.h b/src/quicktemplates/qquickscrollbar_p.h
index f5cfd91034..b43cef1734 100644
--- a/src/quicktemplates/qquickscrollbar_p.h
+++ b/src/quicktemplates/qquickscrollbar_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 class QQuickScrollBarAttached;
 class QQuickScrollBarPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollBar : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollBar : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL)
@@ -156,7 +156,7 @@ private:
 
 class QQuickScrollBarAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollBarAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollBarAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickScrollBar *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
diff --git a/src/quicktemplates/qquickscrollindicator_p.h b/src/quicktemplates/qquickscrollindicator_p.h
index b3be953d73..e6647c77ab 100644
--- a/src/quicktemplates/qquickscrollindicator_p.h
+++ b/src/quicktemplates/qquickscrollindicator_p.h
@@ -23,7 +23,7 @@ class QQuickFlickable;
 class QQuickScrollIndicatorAttached;
 class QQuickScrollIndicatorPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollIndicator : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollIndicator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal size READ size WRITE setSize NOTIFY sizeChanged FINAL)
@@ -96,7 +96,7 @@ private:
 
 class QQuickScrollIndicatorAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollIndicatorAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollIndicatorAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickScrollIndicator *horizontal READ horizontal WRITE setHorizontal NOTIFY horizontalChanged FINAL)
diff --git a/src/quicktemplates/qquickscrollview_p.h b/src/quicktemplates/qquickscrollview_p.h
index 73ade2675a..6cdafd5199 100644
--- a/src/quicktemplates/qquickscrollview_p.h
+++ b/src/quicktemplates/qquickscrollview_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickScrollViewPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickScrollView : public QQuickPane
+class Q_QUICKTEMPLATES2_EXPORT QQuickScrollView : public QQuickPane
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(ScrollView)
diff --git a/src/quicktemplates/qquickselectionrectangle_p.h b/src/quicktemplates/qquickselectionrectangle_p.h
index ad8eb1a917..5a1cf7e041 100644
--- a/src/quicktemplates/qquickselectionrectangle_p.h
+++ b/src/quicktemplates/qquickselectionrectangle_p.h
@@ -26,7 +26,7 @@ class QQuickSelectionRectanglePrivate;
 class QQuickSelectable;
 class QQuickSelectionRectangleAttached;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSelectionRectangle : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickSelectionRectangle : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(SelectionMode selectionMode READ selectionMode WRITE setSelectionMode NOTIFY selectionModeChanged FINAL)
@@ -79,7 +79,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickSelectionRectangle)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSelectionRectangleAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSelectionRectangleAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickSelectionRectangle *control READ control NOTIFY controlChanged FINAL)
diff --git a/src/quicktemplates/qquickshortcutcontext_p_p.h b/src/quicktemplates/qquickshortcutcontext_p_p.h
index efeb541dda..4dcd96d54f 100644
--- a/src/quicktemplates/qquickshortcutcontext_p_p.h
+++ b/src/quicktemplates/qquickshortcutcontext_p_p.h
@@ -22,7 +22,7 @@ QT_BEGIN_NAMESPACE
 
 class QObject;
 
-struct Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickShortcutContext
+struct Q_QUICKTEMPLATES2_EXPORT QQuickShortcutContext
 {
     static bool matcher(QObject *object, Qt::ShortcutContext context);
 };
diff --git a/src/quicktemplates/qquickslider_p.h b/src/quicktemplates/qquickslider_p.h
index ba0b01677d..4374a6b05d 100644
--- a/src/quicktemplates/qquickslider_p.h
+++ b/src/quicktemplates/qquickslider_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickSliderPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSlider : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickSlider : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(qreal from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/quicktemplates/qquickspinbox_p.h b/src/quicktemplates/qquickspinbox_p.h
index 8acf004ce1..c9547f405b 100644
--- a/src/quicktemplates/qquickspinbox_p.h
+++ b/src/quicktemplates/qquickspinbox_p.h
@@ -24,7 +24,7 @@ class QValidator;
 class QQuickSpinBoxPrivate;
 class QQuickIndicatorButton;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSpinBox : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickSpinBox : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(int from READ from WRITE setFrom NOTIFY fromChanged FINAL)
diff --git a/src/quicktemplates/qquicksplitview_p.h b/src/quicktemplates/qquicksplitview_p.h
index 2ce59b9d53..7ba6dc3573 100644
--- a/src/quicktemplates/qquicksplitview_p.h
+++ b/src/quicktemplates/qquicksplitview_p.h
@@ -28,7 +28,7 @@ class QQuickSplitViewAttachedPrivate;
 class QQuickSplitHandleAttached;
 class QQuickSplitHandleAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSplitView : public QQuickContainer
+class Q_QUICKTEMPLATES2_EXPORT QQuickSplitView : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL)
@@ -88,7 +88,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickSplitView)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSplitViewAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSplitViewAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickSplitView *view READ view NOTIFY viewChanged FINAL)
@@ -158,7 +158,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickSplitViewAttached)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSplitHandleAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSplitHandleAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool hovered READ isHovered NOTIFY hoveredChanged FINAL)
diff --git a/src/quicktemplates/qquicksplitview_p_p.h b/src/quicktemplates/qquicksplitview_p_p.h
index 849f709f81..d2b0c35668 100644
--- a/src/quicktemplates/qquicksplitview_p_p.h
+++ b/src/quicktemplates/qquicksplitview_p_p.h
@@ -23,7 +23,7 @@ class QQuickSplitView;
 class QQuickSplitViewAttached;
 class QQuickSplitHandleAttached;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSplitViewPrivate : public QQuickContainerPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickSplitViewPrivate : public QQuickContainerPrivate
 {
     Q_DECLARE_PUBLIC(QQuickSplitView)
 
diff --git a/src/quicktemplates/qquickstackview_p.h b/src/quicktemplates/qquickstackview_p.h
index b2ece576cf..fb9e8e38d6 100644
--- a/src/quicktemplates/qquickstackview_p.h
+++ b/src/quicktemplates/qquickstackview_p.h
@@ -62,7 +62,7 @@ private:
     QVariantMap mProperties;
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackView : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickStackView : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(bool busy READ isBusy NOTIFY busyChanged FINAL)
@@ -207,7 +207,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickStackView)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickStackViewAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickStackViewAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)
diff --git a/src/quicktemplates/qquickswipe_p.h b/src/quicktemplates/qquickswipe_p.h
index 4694948763..44eadcb584 100644
--- a/src/quicktemplates/qquickswipe_p.h
+++ b/src/quicktemplates/qquickswipe_p.h
@@ -26,7 +26,7 @@ class QQuickItem;
 class QQuickTransition;
 class QQuickSwipePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipe : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipe : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/quicktemplates/qquickswipedelegate_p.h b/src/quicktemplates/qquickswipedelegate_p.h
index 576988acb0..fae6c6136d 100644
--- a/src/quicktemplates/qquickswipedelegate_p.h
+++ b/src/quicktemplates/qquickswipedelegate_p.h
@@ -24,7 +24,7 @@ class QQuickSwipeDelegatePrivate;
 class QQuickSwipeDelegateAttached;
 class QQuickSwipeDelegateAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeDelegate : public QQuickItemDelegate
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
     Q_PROPERTY(QQuickSwipe *swipe READ swipe CONSTANT FINAL)
@@ -64,7 +64,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickSwipeDelegate)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeDelegateAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeDelegateAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(bool pressed READ isPressed NOTIFY pressedChanged FINAL)
diff --git a/src/quicktemplates/qquickswipeview_p.h b/src/quicktemplates/qquickswipeview_p.h
index 5e91daa994..758de23ffe 100644
--- a/src/quicktemplates/qquickswipeview_p.h
+++ b/src/quicktemplates/qquickswipeview_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 class QQuickSwipeViewAttached;
 class QQuickSwipeViewPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeView : public QQuickContainer
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeView : public QQuickContainer
 {
     Q_OBJECT
     // 2.1 (Qt 5.8)
@@ -79,7 +79,7 @@ private:
 
 class QQuickSwipeViewAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwipeViewAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwipeViewAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)
diff --git a/src/quicktemplates/qquickswitch_p.h b/src/quicktemplates/qquickswitch_p.h
index 9c883d1535..4ee45e8d50 100644
--- a/src/quicktemplates/qquickswitch_p.h
+++ b/src/quicktemplates/qquickswitch_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickSwitchPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwitch : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwitch : public QQuickAbstractButton
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/quicktemplates/qquickswitchdelegate_p.h b/src/quicktemplates/qquickswitchdelegate_p.h
index de0cf412c2..26823c3fa8 100644
--- a/src/quicktemplates/qquickswitchdelegate_p.h
+++ b/src/quicktemplates/qquickswitchdelegate_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickSwitchDelegatePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickSwitchDelegate : public QQuickItemDelegate
+class Q_QUICKTEMPLATES2_EXPORT QQuickSwitchDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
     Q_PROPERTY(qreal position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/quicktemplates/qquicktabbar_p.h b/src/quicktemplates/qquicktabbar_p.h
index 5934ea59fe..f0b7ebb12f 100644
--- a/src/quicktemplates/qquicktabbar_p.h
+++ b/src/quicktemplates/qquicktabbar_p.h
@@ -25,7 +25,7 @@ class QQuickTabBarPrivate;
 class QQuickTabBarAttached;
 class QQuickTabBarAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabBar : public QQuickContainer
+class Q_QUICKTEMPLATES2_EXPORT QQuickTabBar : public QQuickContainer
 {
     Q_OBJECT
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
@@ -73,7 +73,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickTabBar)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabBarAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickTabBarAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int index READ index NOTIFY indexChanged FINAL)
diff --git a/src/quicktemplates/qquicktabbutton.cpp b/src/quicktemplates/qquicktabbutton.cpp
index 500ee0e81b..1c8402fd23 100644
--- a/src/quicktemplates/qquicktabbutton.cpp
+++ b/src/quicktemplates/qquicktabbutton.cpp
@@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE
     \sa TabBar, {Customizing TabButton}, {Button Controls}, {Navigation Controls}
 */
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabButtonPrivate : public QQuickAbstractButtonPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickTabButtonPrivate : public QQuickAbstractButtonPrivate
 {
     Q_DECLARE_PUBLIC(QQuickTabButton)
 
diff --git a/src/quicktemplates/qquicktabbutton_p.h b/src/quicktemplates/qquicktabbutton_p.h
index 431014e277..1ba7ac5f5a 100644
--- a/src/quicktemplates/qquicktabbutton_p.h
+++ b/src/quicktemplates/qquicktabbutton_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickTabButtonPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTabButton : public QQuickAbstractButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickTabButton : public QQuickAbstractButton
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(TabButton)
diff --git a/src/quicktemplates/qquicktextarea_p.h b/src/quicktemplates/qquicktextarea_p.h
index da56816a9c..3bb400d7bc 100644
--- a/src/quicktemplates/qquicktextarea_p.h
+++ b/src/quicktemplates/qquicktextarea_p.h
@@ -26,7 +26,7 @@ class QQuickText;
 class QQuickTextAreaPrivate;
 class QQuickTextAreaAttached;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextArea : public QQuickTextEdit
+class Q_QUICKTEMPLATES2_EXPORT QQuickTextArea : public QQuickTextEdit
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
@@ -151,7 +151,7 @@ private:
 
 class QQuickTextAreaAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextAreaAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickTextAreaAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickTextArea *flickable READ flickable WRITE setFlickable NOTIFY flickableChanged FINAL)
diff --git a/src/quicktemplates/qquicktextfield_p.h b/src/quicktemplates/qquicktextfield_p.h
index 27eec3b4da..62f77c0572 100644
--- a/src/quicktemplates/qquicktextfield_p.h
+++ b/src/quicktemplates/qquicktextfield_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickTextFieldPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTextField : public QQuickTextInput
+class Q_QUICKTEMPLATES2_EXPORT QQuickTextField : public QQuickTextInput
 {
     Q_OBJECT
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged) // override
diff --git a/src/quicktemplates/qquicktheme_p.h b/src/quicktemplates/qquicktheme_p.h
index da6254e9bf..96cbd2c0ad 100644
--- a/src/quicktemplates/qquicktheme_p.h
+++ b/src/quicktemplates/qquicktheme_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickThemePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTheme
+class Q_QUICKTEMPLATES2_EXPORT QQuickTheme
 {
 public:
     QQuickTheme();
diff --git a/src/quicktemplates/qquicktheme_p_p.h b/src/quicktemplates/qquicktheme_p_p.h
index a18957bd0d..f6c9cc39fb 100644
--- a/src/quicktemplates/qquicktheme_p_p.h
+++ b/src/quicktemplates/qquicktheme_p_p.h
@@ -19,7 +19,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickThemePrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickThemePrivate
 {
 public:
     static QQuickThemePrivate *get(QQuickTheme *theme)
diff --git a/src/quicktemplates/qquicktoolbar_p.h b/src/quicktemplates/qquicktoolbar_p.h
index 98c2858432..3079bc78f0 100644
--- a/src/quicktemplates/qquicktoolbar_p.h
+++ b/src/quicktemplates/qquicktoolbar_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickToolBarPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolBar : public QQuickPane
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolBar : public QQuickPane
 {
     Q_OBJECT
     Q_PROPERTY(Position position READ position WRITE setPosition NOTIFY positionChanged FINAL)
diff --git a/src/quicktemplates/qquicktoolbutton.cpp b/src/quicktemplates/qquicktoolbutton.cpp
index 3acf8782a1..d857b8ab40 100644
--- a/src/quicktemplates/qquicktoolbutton.cpp
+++ b/src/quicktemplates/qquicktoolbutton.cpp
@@ -32,7 +32,7 @@ QT_BEGIN_NAMESPACE
     \sa ToolBar, {Customizing ToolButton}, {Button Controls}
 */
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolPrivate : public QQuickButtonPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolPrivate : public QQuickButtonPrivate
 {
     Q_DECLARE_PUBLIC(QQuickToolButton)
 
diff --git a/src/quicktemplates/qquicktoolbutton_p.h b/src/quicktemplates/qquicktoolbutton_p.h
index fd3a83dd1a..2ddd9087c6 100644
--- a/src/quicktemplates/qquicktoolbutton_p.h
+++ b/src/quicktemplates/qquicktoolbutton_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickToolButtonPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolButton : public QQuickButton
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolButton : public QQuickButton
 {
     Q_OBJECT
     QML_NAMED_ELEMENT(ToolButton)
diff --git a/src/quicktemplates/qquicktoolseparator_p.h b/src/quicktemplates/qquicktoolseparator_p.h
index fb060b73a8..04d941566c 100644
--- a/src/quicktemplates/qquicktoolseparator_p.h
+++ b/src/quicktemplates/qquicktoolseparator_p.h
@@ -21,7 +21,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickToolSeparatorPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolSeparator : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolSeparator : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged FINAL)
diff --git a/src/quicktemplates/qquicktooltip_p.h b/src/quicktemplates/qquicktooltip_p.h
index 9f49c85a7f..1ac89d8efb 100644
--- a/src/quicktemplates/qquicktooltip_p.h
+++ b/src/quicktemplates/qquicktooltip_p.h
@@ -23,7 +23,7 @@ class QQuickToolTipPrivate;
 class QQuickToolTipAttached;
 class QQuickToolTipAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolTip : public QQuickPopup
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolTip : public QQuickPopup
 {
     Q_OBJECT
     Q_PROPERTY(int delay READ delay WRITE setDelay NOTIFY delayChanged FINAL)
@@ -74,7 +74,7 @@ private:
     Q_DECLARE_PRIVATE(QQuickToolTip)
 };
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickToolTipAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickToolTipAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged FINAL)
diff --git a/src/quicktemplates/qquicktreeviewdelegate_p.h b/src/quicktemplates/qquicktreeviewdelegate_p.h
index aa39b17c10..e56057301e 100644
--- a/src/quicktemplates/qquicktreeviewdelegate_p.h
+++ b/src/quicktemplates/qquicktreeviewdelegate_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 
 class QQuickTreeViewDelegatePrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTreeViewDelegate : public QQuickItemDelegate
+class Q_QUICKTEMPLATES2_EXPORT QQuickTreeViewDelegate : public QQuickItemDelegate
 {
     Q_OBJECT
     Q_PROPERTY(qreal indentation READ indentation WRITE setIndentation NOTIFY indentationChanged FINAL)
diff --git a/src/quicktemplates/qquicktumbler_p.h b/src/quicktemplates/qquicktumbler_p.h
index 52051c71a8..d2f980aad0 100644
--- a/src/quicktemplates/qquicktumbler_p.h
+++ b/src/quicktemplates/qquicktumbler_p.h
@@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE
 class QQuickTumblerAttached;
 class QQuickTumblerPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumbler : public QQuickControl
+class Q_QUICKTEMPLATES2_EXPORT QQuickTumbler : public QQuickControl
 {
     Q_OBJECT
     Q_PROPERTY(QVariant model READ model WRITE setModel NOTIFY modelChanged FINAL)
@@ -118,7 +118,7 @@ private:
 
 class QQuickTumblerAttachedPrivate;
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerAttached : public QObject
+class Q_QUICKTEMPLATES2_EXPORT QQuickTumblerAttached : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QQuickTumbler *tumbler READ tumbler CONSTANT FINAL)
diff --git a/src/quicktemplates/qquicktumbler_p_p.h b/src/quicktemplates/qquicktumbler_p_p.h
index 22bda25e76..70a611bf0f 100644
--- a/src/quicktemplates/qquicktumbler_p_p.h
+++ b/src/quicktemplates/qquicktumbler_p_p.h
@@ -22,7 +22,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerPrivate : public QQuickControlPrivate
+class Q_QUICKTEMPLATES2_EXPORT QQuickTumblerPrivate : public QQuickControlPrivate
 {
     Q_DECLARE_PUBLIC(QQuickTumbler)
 
diff --git a/src/quicktemplates/qtquicktemplates2global_p.h b/src/quicktemplates/qtquicktemplates2global_p.h
index 4d95cdc41d..27b5947994 100644
--- a/src/quicktemplates/qtquicktemplates2global_p.h
+++ b/src/quicktemplates/qtquicktemplates2global_p.h
@@ -18,12 +18,12 @@
 #include <QtCore/qglobal.h>
 #include <QtQml/private/qqmlglobal_p.h>
 #include <QtQuickTemplates2/private/qtquicktemplates2-config_p.h>
-#include <QtQuickTemplates2/private/qtquicktemplates2exports_p.h>
+#include <QtQuickTemplates2/qtquicktemplates2exports.h>
 
 QT_BEGIN_NAMESPACE
 
-Q_QUICKTEMPLATES2_PRIVATE_EXPORT void QQuickTemplates_initializeModule();
-Q_QUICKTEMPLATES2_PRIVATE_EXPORT void qml_register_types_QtQuick_Templates();
+Q_QUICKTEMPLATES2_EXPORT void QQuickTemplates_initializeModule();
+Q_QUICKTEMPLATES2_EXPORT void qml_register_types_QtQuick_Templates();
 
 [[maybe_unused]] static inline QString backgroundName() { return QStringLiteral("background"); }
 [[maybe_unused]] static inline QString handleName() { return QStringLiteral("handle"); }