From 6f57601222053d24385ee86259d0534e9c58dcaf Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 13 Jun 2022 10:05:11 +0300
Subject: [PATCH] do not export QTreeViewPrivate, QApplicationPrivate and
 QFontPrivate classes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 src/gui/itemviews/qtreeview_p.h                          | 2 +-
 src/gui/kernel/qapplication_p.h                          | 2 +-
 src/gui/text/qfont_p.h                                   | 2 +-
 src/gui/widgets/qabstractscrollarea_p.h                  | 1 +
 tests/auto/qkeysequence/tst_qkeysequence.cpp             | 1 -
 tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/itemviews/qtreeview_p.h b/src/gui/itemviews/qtreeview_p.h
index 3e37a3cd1..d103cd435 100644
--- a/src/gui/itemviews/qtreeview_p.h
+++ b/src/gui/itemviews/qtreeview_p.h
@@ -58,7 +58,7 @@ struct QTreeViewItem
 
 Q_DECLARE_TYPEINFO(QTreeViewItem, Q_MOVABLE_TYPE);
 
-class Q_GUI_EXPORT QTreeViewPrivate : public QAbstractItemViewPrivate
+class Q_AUTOTEST_EXPORT QTreeViewPrivate : public QAbstractItemViewPrivate
 {
     Q_DECLARE_PUBLIC(QTreeView)
 public:
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 734245ae2..7ac735f38 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -68,7 +68,7 @@ FontHash *qt_app_fonts_hash();
 typedef QHash<QByteArray, QPalette> PaletteHash;
 PaletteHash *qt_app_palettes_hash();
 
-class Q_GUI_EXPORT QApplicationPrivate : public QCoreApplicationPrivate
+class QApplicationPrivate : public QCoreApplicationPrivate
 {
     Q_DECLARE_PUBLIC(QApplication)
 public:
diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h
index 35a8b8062..6b740a524 100644
--- a/src/gui/text/qfont_p.h
+++ b/src/gui/text/qfont_p.h
@@ -99,7 +99,7 @@ struct QFontDef
     }
 };
 
-class Q_GUI_EXPORT QFontPrivate
+class QFontPrivate
 {
 public:
     QFontPrivate();
diff --git a/src/gui/widgets/qabstractscrollarea_p.h b/src/gui/widgets/qabstractscrollarea_p.h
index 1801a14a0..46481b9bb 100644
--- a/src/gui/widgets/qabstractscrollarea_p.h
+++ b/src/gui/widgets/qabstractscrollarea_p.h
@@ -42,6 +42,7 @@ QT_BEGIN_NAMESPACE
 
 class QScrollBar;
 class QAbstractScrollAreaScrollBarContainer;
+
 class Q_GUI_EXPORT QAbstractScrollAreaPrivate: public QFramePrivate
 {
     Q_DECLARE_PUBLIC(QAbstractScrollArea)
diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp
index 99520d841..e69ccf9c0 100644
--- a/tests/auto/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp
@@ -22,7 +22,6 @@
 
 #include <QtTest/QtTest>
 #include <qkeysequence.h>
-#include <qapplication_p.h>
 #include <qkeysequence_p.h>
 #include <qdebug.h>
 
diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 447bb0b0a..616797c27 100644
--- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -1444,7 +1444,7 @@ static QModelIndex indexFromText(QStandardItemModel *model, const QString &text)
 struct FriendlyTreeView : public QTreeView
 {
     friend class tst_QStandardItemModel;
-	Q_DECLARE_PRIVATE(QTreeView)
+    Q_DECLARE_PRIVATE(QTreeView)
 };
 #endif