Move Q_DECLARE_PUBLIC to the public section

This is now required to use QObjectPrivate::connect.

Change-Id: Iccb47e5527544b6fbd75fffd16b8bd87f0818ad5
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

34 files changed, 37 insertions, 37 deletions

diff --git a/src/quick/items/qquickitemview_p_p.h b/src/quick/items/qquickitemview_p_p.h
index 79d10fafc4..d3b12268aa 100644
--- a/src/quick/items/qquickitemview_p_p.h
+++ b/src/quick/items/qquickitemview_p_p.h
@@ -102,8 +102,8 @@ public:
 
 class Q_QUICK_AUTOTEST_EXPORT QQuickItemViewPrivate : public QQuickFlickablePrivate, public QQuickItemViewTransitionChangeListener, public QAnimationJobChangeListener
 {
-    Q_DECLARE_PUBLIC(QQuickItemView)
 public:
+    Q_DECLARE_PUBLIC(QQuickItemView)
     QQuickItemViewPrivate();
     ~QQuickItemViewPrivate();
 
diff --git a/src/quick/items/qquicklistview.cpp b/src/quick/items/qquicklistview.cpp
index 678d23d5e5..7d1829858d 100644
--- a/src/quick/items/qquicklistview.cpp
+++ b/src/quick/items/qquicklistview.cpp
@@ -64,8 +64,8 @@ class FxListItemSG;
 
 class QQuickListViewPrivate : public QQuickItemViewPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickListView)
 public:
+    Q_DECLARE_PUBLIC(QQuickListView)
     static QQuickListViewPrivate* get(QQuickListView *item) { return item->d_func(); }
 
     Qt::Orientation layoutOrientation() const override;
diff --git a/src/quick/items/qquicktableview_p_p.h b/src/quick/items/qquicktableview_p_p.h
index 77b492b707..f1113ed543 100644
--- a/src/quick/items/qquicktableview_p_p.h
+++ b/src/quick/items/qquicktableview_p_p.h
@@ -95,9 +95,9 @@ private:
 
 class Q_QUICK_PRIVATE_EXPORT QQuickTableViewPrivate : public QQuickFlickablePrivate, public QQuickSelectable
 {
+public:
     Q_DECLARE_PUBLIC(QQuickTableView)
 
-public:
     class TableEdgeLoadRequest
     {
         // Whenever we need to load new rows or columns in the
diff --git a/src/quick/items/qquicktextcontrol_p_p.h b/src/quick/items/qquicktextcontrol_p_p.h
index d52200b49d..065a281cb5 100644
--- a/src/quick/items/qquicktextcontrol_p_p.h
+++ b/src/quick/items/qquicktextcontrol_p_p.h
@@ -67,8 +67,8 @@ class QAbstractScrollArea;
 
 class QQuickTextControlPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickTextControl)
 public:
+    Q_DECLARE_PUBLIC(QQuickTextControl)
     QQuickTextControlPrivate();
 
     bool cursorMoveKeyEvent(QKeyEvent *e);
diff --git a/src/quick/util/qquickdeliveryagent_p_p.h b/src/quick/util/qquickdeliveryagent_p_p.h
index f9095158e8..abfe6d9a8f 100644
--- a/src/quick/util/qquickdeliveryagent_p_p.h
+++ b/src/quick/util/qquickdeliveryagent_p_p.h
@@ -76,8 +76,8 @@ struct QQuickPointingDeviceExtra {
 
 class Q_QUICK_PRIVATE_EXPORT QQuickDeliveryAgentPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickDeliveryAgent)
 public:
+    Q_DECLARE_PUBLIC(QQuickDeliveryAgent)
     QQuickDeliveryAgentPrivate(QQuickItem *root);
     ~QQuickDeliveryAgentPrivate();
 
diff --git a/src/quickcontrols2impl/qquickattachedobject.cpp b/src/quickcontrols2impl/qquickattachedobject.cpp
index 722f22f9be..d03b8dbbf1 100644
--- a/src/quickcontrols2impl/qquickattachedobject.cpp
+++ b/src/quickcontrols2impl/qquickattachedobject.cpp
@@ -158,9 +158,9 @@ static QQuickItem *findAttachedItem(QObject *parent)
 
 class QQuickAttachedObjectPrivate : public QObjectPrivate, public QQuickItemChangeListener
 {
+public:
     Q_DECLARE_PUBLIC(QQuickAttachedObject)
 
-public:
     static QQuickAttachedObjectPrivate *get(QQuickAttachedObject *attachedObject)
     {
         return attachedObject->d_func();
diff --git a/src/quickcontrols2impl/qquickiconimage_p_p.h b/src/quickcontrols2impl/qquickiconimage_p_p.h
index 662785b791..e609e9cc57 100644
--- a/src/quickcontrols2impl/qquickiconimage_p_p.h
+++ b/src/quickcontrols2impl/qquickiconimage_p_p.h
@@ -56,9 +56,9 @@ QT_BEGIN_NAMESPACE
 
 class Q_QUICKCONTROLS2IMPL_PRIVATE_EXPORT QQuickIconImagePrivate : public QQuickImagePrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickIconImage)
 
-public:
     ~QQuickIconImagePrivate() override;
     void updateIcon();
     void updateFillMode();
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogdelegate.cpp b/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogdelegate.cpp
index b1d4477305..766d193b1a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogdelegate.cpp
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogdelegate.cpp
@@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE
 
 class QQuickFileDialogDelegatePrivate : public QQuickItemDelegatePrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickFileDialogDelegate)
 
-public:
     void highlightFile();
     void chooseFile();
 
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl_p_p.h b/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl_p_p.h
index 1831a7dc58..92025a7a4c 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl_p_p.h
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qquickfiledialogimpl_p_p.h
@@ -60,9 +60,9 @@ class QQuickFileNameFilter;
 
 class QQuickFileDialogImplPrivate : public QQuickDialogPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickFileDialogImpl)
 
-public:
     QQuickFileDialogImplPrivate();
 
     static QQuickFileDialogImplPrivate *get(QQuickFileDialogImpl *dialog)
@@ -92,12 +92,12 @@ public:
 
 class QQuickFileDialogImplAttachedPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickFileDialogImplAttached)
-
     void nameFiltersComboBoxItemActivated(int index);
     void fileDialogListViewCurrentIndexChanged();
 
 public:
+    Q_DECLARE_PUBLIC(QQuickFileDialogImplAttached)
+
     QPointer<QQuickDialogButtonBox> buttonBox;
     QPointer<QQuickComboBox> nameFiltersComboBox;
     QPointer<QQuickListView> fileDialogListView;
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar_p_p.h b/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar_p_p.h
index 4616b6a9c5..8c832110e1 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar_p_p.h
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qquickfolderbreadcrumbbar_p_p.h
@@ -60,9 +60,9 @@ class QQuickTextField;
 
 class Q_QUICKDIALOGS2QUICKIMPL_PRIVATE_EXPORT QQuickFolderBreadcrumbBarPrivate : public QQuickContainerPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickFolderBreadcrumbBar)
 
-public:
     QQuickItem *createDelegateItem(QQmlComponent *component, const QVariantMap &initialProperties);
     static QString folderBaseName(const QString &folderPath);
     static QStringList crumbPathsForFolder(const QUrl &folder);
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl_p_p.h b/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl_p_p.h
index 8de3480dd9..eb0e5d247a 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl_p_p.h
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qquickfontdialogimpl_p_p.h
@@ -81,11 +81,11 @@ public:
 
 class QQuickFontDialogImplAttachedPrivate : public QObjectPrivate
 {
-    Q_DECLARE_PUBLIC(QQuickFontDialogImplAttached)
-
     void currentFontChanged(const QFont &font);
 
 public:
+    Q_DECLARE_PUBLIC(QQuickFontDialogImplAttached)
+
     QPointer<QQuickDialogButtonBox> buttonBox;
     QPointer<QQuickListView> familyListView;
     QPointer<QQuickListView> styleListView;
diff --git a/src/quicktemplates2/qquickabstractbutton_p_p.h b/src/quicktemplates2/qquickabstractbutton_p_p.h
index 744d9e6678..6e158e4e23 100644
--- a/src/quicktemplates2/qquickabstractbutton_p_p.h
+++ b/src/quicktemplates2/qquickabstractbutton_p_p.h
@@ -61,9 +61,9 @@ class QQuickButtonGroup;
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButtonPrivate : public QQuickControlPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickAbstractButton)
 
-public:
     static QQuickAbstractButtonPrivate *get(QQuickAbstractButton *button)
     {
         return button->d_func();
diff --git a/src/quicktemplates2/qquickactiongroup.cpp b/src/quicktemplates2/qquickactiongroup.cpp
index 1656ecf51e..bd412bc40e 100644
--- a/src/quicktemplates2/qquickactiongroup.cpp
+++ b/src/quicktemplates2/qquickactiongroup.cpp
@@ -139,9 +139,9 @@ QT_BEGIN_NAMESPACE
 
 class QQuickActionGroupPrivate : public QObjectPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickActionGroup)
 
-public:
     void clear();
     void actionTriggered();
     void _q_updateCurrent();
diff --git a/src/quicktemplates2/qquickapplicationwindow.cpp b/src/quicktemplates2/qquickapplicationwindow.cpp
index 4ed606b125..dbe422c86d 100644
--- a/src/quicktemplates2/qquickapplicationwindow.cpp
+++ b/src/quicktemplates2/qquickapplicationwindow.cpp
@@ -747,9 +747,9 @@ void QQuickApplicationWindow::resizeEvent(QResizeEvent *event)
 
 class QQuickApplicationWindowAttachedPrivate : public QObjectPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickApplicationWindowAttached)
 
-public:
     void windowChange(QQuickWindow *wnd);
     void activeFocusChange();
 
diff --git a/src/quicktemplates2/qquickbuttongroup.cpp b/src/quicktemplates2/qquickbuttongroup.cpp
index fd8e822c5f..f2858beaac 100644
--- a/src/quicktemplates2/qquickbuttongroup.cpp
+++ b/src/quicktemplates2/qquickbuttongroup.cpp
@@ -151,9 +151,9 @@ QT_BEGIN_NAMESPACE
 
 class QQuickButtonGroupPrivate : public QObjectPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickButtonGroup)
 
-public:
     void clear();
     void buttonClicked();
     void _q_updateCurrent();
diff --git a/src/quicktemplates2/qquickcombobox.cpp b/src/quicktemplates2/qquickcombobox.cpp
index 6c3d5768f6..0efe6f01a3 100644
--- a/src/quicktemplates2/qquickcombobox.cpp
+++ b/src/quicktemplates2/qquickcombobox.cpp
@@ -217,9 +217,9 @@ QVariant QQuickComboBoxDelegateModel::variantValue(int index, const QString &rol
 
 class QQuickComboBoxPrivate : public QQuickControlPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickComboBox)
 
-public:
     bool isPopupVisible() const;
     void showPopup();
     void hidePopup(bool accept);
diff --git a/src/quicktemplates2/qquickcontainer_p_p.h b/src/quicktemplates2/qquickcontainer_p_p.h
index b9f8eb0f01..1658032ba5 100644
--- a/src/quicktemplates2/qquickcontainer_p_p.h
+++ b/src/quicktemplates2/qquickcontainer_p_p.h
@@ -56,9 +56,9 @@ QT_BEGIN_NAMESPACE
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickContainerPrivate : public QQuickControlPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickContainer)
 
-public:
     static QQuickContainerPrivate *get(QQuickContainer *container)
     {
         return container->d_func();
diff --git a/src/quicktemplates2/qquickcontrol_p_p.h b/src/quicktemplates2/qquickcontrol_p_p.h
index 4b8fb3e0b5..4e8200ad8f 100644
--- a/src/quicktemplates2/qquickcontrol_p_p.h
+++ b/src/quicktemplates2/qquickcontrol_p_p.h
@@ -73,9 +73,9 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickControlPrivate : public QQuickItemP
     , public QAccessible::ActivationObserver
 #endif
 {
+public:
     Q_DECLARE_PUBLIC(QQuickControl)
 
-public:
     QQuickControlPrivate();
     ~QQuickControlPrivate();
 
diff --git a/src/quicktemplates2/qquickdialog_p_p.h b/src/quicktemplates2/qquickdialog_p_p.h
index eb40c918a4..d37f1ce010 100644
--- a/src/quicktemplates2/qquickdialog_p_p.h
+++ b/src/quicktemplates2/qquickdialog_p_p.h
@@ -59,9 +59,9 @@ class QQuickDialogButtonBox;
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogPrivate : public QQuickPopupPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickDialog)
 
-public:
     static QQuickDialogPrivate *get(QQuickDialog *dialog)
     {
         return dialog->d_func();
diff --git a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
index 5e08b2adf1..75c00be550 100644
--- a/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
+++ b/src/quicktemplates2/qquickdialogbuttonbox_p_p.h
@@ -55,9 +55,9 @@ QT_BEGIN_NAMESPACE
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialogButtonBoxPrivate : public QQuickContainerPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickDialogButtonBox)
 
-public:
     static QQuickDialogButtonBoxPrivate *get(QQuickDialogButtonBox *box)
     {
         return box->d_func();
diff --git a/src/quicktemplates2/qquicklabel_p_p.h b/src/quicktemplates2/qquicklabel_p_p.h
index a9bda6717c..be2d220543 100644
--- a/src/quicktemplates2/qquicklabel_p_p.h
+++ b/src/quicktemplates2/qquicklabel_p_p.h
@@ -65,9 +65,9 @@ class QQuickLabelPrivate : public QQuickTextPrivate, public QQuickItemChangeList
     , public QAccessible::ActivationObserver
 #endif
 {
+public:
     Q_DECLARE_PUBLIC(QQuickLabel)
 
-public:
     QQuickLabelPrivate();
     ~QQuickLabelPrivate();
 
diff --git a/src/quicktemplates2/qquickmenu_p_p.h b/src/quicktemplates2/qquickmenu_p_p.h
index 86701d9bef..f85dc5d8ca 100644
--- a/src/quicktemplates2/qquickmenu_p_p.h
+++ b/src/quicktemplates2/qquickmenu_p_p.h
@@ -63,9 +63,9 @@ class QQuickMenuItem;
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuPrivate : public QQuickPopupPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickMenu)
 
-public:
     QQuickMenuPrivate();
 
     static QQuickMenuPrivate *get(QQuickMenu *menu)
diff --git a/src/quicktemplates2/qquickmenubar_p_p.h b/src/quicktemplates2/qquickmenubar_p_p.h
index 0562d7e5dc..b25688c76b 100644
--- a/src/quicktemplates2/qquickmenubar_p_p.h
+++ b/src/quicktemplates2/qquickmenubar_p_p.h
@@ -58,9 +58,9 @@ class QQuickMenuBarItem;
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickMenuBarPrivate : public QQuickContainerPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickMenuBar)
 
-public:
     static QQuickMenuBarPrivate *get(QQuickMenuBar *menuBar)
     {
         return menuBar->d_func();
diff --git a/src/quicktemplates2/qquickmenuitem_p_p.h b/src/quicktemplates2/qquickmenuitem_p_p.h
index 966e14e7e9..df17c3f936 100644
--- a/src/quicktemplates2/qquickmenuitem_p_p.h
+++ b/src/quicktemplates2/qquickmenuitem_p_p.h
@@ -57,9 +57,9 @@ class QQuickMenu;
 
 class QQuickMenuItemPrivate : public QQuickAbstractButtonPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickMenuItem)
 
-public:
     static QQuickMenuItemPrivate *get(QQuickMenuItem *item)
     {
         return item->d_func();
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp
index da636e1a2c..9700785aed 100644
--- a/src/quicktemplates2/qquickoverlay.cpp
+++ b/src/quicktemplates2/qquickoverlay.cpp
@@ -590,9 +590,9 @@ bool QQuickOverlay::eventFilter(QObject *object, QEvent *event)
 
 class QQuickOverlayAttachedPrivate : public QObjectPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickOverlayAttached)
 
-public:
     void setWindow(QQuickWindow *newWindow);
 
     QQuickWindow *window = nullptr;
diff --git a/src/quicktemplates2/qquickoverlay_p_p.h b/src/quicktemplates2/qquickoverlay_p_p.h
index fbb2f86c73..966aa08ba1 100644
--- a/src/quicktemplates2/qquickoverlay_p_p.h
+++ b/src/quicktemplates2/qquickoverlay_p_p.h
@@ -60,9 +60,9 @@ class QQuickDrawer;
 
 class QQuickOverlayPrivate : public QQuickItemPrivate, public QQuickItemChangeListener
 {
+public:
     Q_DECLARE_PUBLIC(QQuickOverlay)
 
-public:
     static QQuickOverlayPrivate *get(QQuickOverlay *overlay)
     {
         return overlay->d_func();
diff --git a/src/quicktemplates2/qquickpane_p_p.h b/src/quicktemplates2/qquickpane_p_p.h
index bd89aee2f8..a0ec774e80 100644
--- a/src/quicktemplates2/qquickpane_p_p.h
+++ b/src/quicktemplates2/qquickpane_p_p.h
@@ -56,9 +56,9 @@ class QQuickPane;
 
 class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPanePrivate : public QQuickControlPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickPane)
 
-public:
     void init();
 
     virtual QQmlListProperty<QObject> contentData();
diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index a598399635..91138d6d4b 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -88,9 +88,9 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickPopupPrivate
     , public QQuickItemChangeListener
     , public QQuickPaletteProviderPrivateBase<QQuickPopup, QQuickPopupPrivate>
 {
+public:
     Q_DECLARE_PUBLIC(QQuickPopup)
 
-public:
     QQuickPopupPrivate();
 
     static QQuickPopupPrivate *get(QQuickPopup *popup)
diff --git a/src/quicktemplates2/qquickscrollview.cpp b/src/quicktemplates2/qquickscrollview.cpp
index 381795f5b8..7311d6bd18 100644
--- a/src/quicktemplates2/qquickscrollview.cpp
+++ b/src/quicktemplates2/qquickscrollview.cpp
@@ -125,9 +125,9 @@ QT_BEGIN_NAMESPACE
 
 class QQuickScrollViewPrivate : public QQuickPanePrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickScrollView)
 
-public:
     QQmlListProperty<QObject> contentData() override;
     QQmlListProperty<QQuickItem> contentChildren() override;
     QList<QQuickItem *> contentChildItems() const override;
diff --git a/src/quicktemplates2/qquickselectionrectangle_p_p.h b/src/quicktemplates2/qquickselectionrectangle_p_p.h
index a42e9e78bc..04d79c98be 100644
--- a/src/quicktemplates2/qquickselectionrectangle_p_p.h
+++ b/src/quicktemplates2/qquickselectionrectangle_p_p.h
@@ -63,9 +63,9 @@ QT_BEGIN_NAMESPACE
 
 class QQuickSelectionRectanglePrivate : public QQuickControlPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickSelectionRectangle)
 
-public:
     QQuickSelectionRectanglePrivate();
 
     void updateDraggingState(bool isDragging);
diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp
index b9cc68d26d..08305aa115 100644
--- a/src/quicktemplates2/qquickswipeview.cpp
+++ b/src/quicktemplates2/qquickswipeview.cpp
@@ -125,9 +125,9 @@ public:
 
 class QQuickSwipeViewAttachedPrivate : public QObjectPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickSwipeViewAttached)
 
-public:
     static QQuickSwipeViewAttachedPrivate *get(QQuickSwipeViewAttached *attached)
     {
         return attached->d_func();
diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index f881058121..0172b48baa 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -97,9 +97,9 @@ QT_BEGIN_NAMESPACE
 
 class QQuickTabBarPrivate : public QQuickContainerPrivate
 {
+public:
     Q_DECLARE_PUBLIC(QQuickTabBar)
 
-public:
     void updateCurrentItem();
     void updateCurrentIndex();
     void updateLayout();
diff --git a/src/quicktemplates2/qquicktextarea_p_p.h b/src/quicktemplates2/qquicktextarea_p_p.h
index 2ed2b44f31..7023aeee9f 100644
--- a/src/quicktemplates2/qquicktextarea_p_p.h
+++ b/src/quicktemplates2/qquicktextarea_p_p.h
@@ -70,9 +70,9 @@ class QQuickTextAreaPrivate : public QQuickTextEditPrivate, public QQuickItemCha
     , public QAccessible::ActivationObserver
 #endif
 {
+public:
     Q_DECLARE_PUBLIC(QQuickTextArea)
 
-public:
     QQuickTextAreaPrivate();
     ~QQuickTextAreaPrivate();
 
diff --git a/src/quicktemplates2/qquicktextfield_p_p.h b/src/quicktemplates2/qquicktextfield_p_p.h
index d81289726b..42f038bc9d 100644
--- a/src/quicktemplates2/qquicktextfield_p_p.h
+++ b/src/quicktemplates2/qquicktextfield_p_p.h
@@ -68,9 +68,9 @@ class QQuickTextFieldPrivate : public QQuickTextInputPrivate, public QQuickItemC
     , public QAccessible::ActivationObserver
 #endif
 {
+public:
     Q_DECLARE_PUBLIC(QQuickTextField)
 
-public:
     QQuickTextFieldPrivate();
     ~QQuickTextFieldPrivate();