From 7b736e1faf1fb6ed69a0a4b53b96ec3a9e9941e8 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Tue, 17 May 2022 09:40:48 +0200
Subject: [PATCH] Make qGlobalPostedEventsCount() auto-test-exported-only

The only in-tree user outside QtCore is tst_QCoreApplication, guard
the (single) test function there with QT_BUILD_INTERNAL.

Change-Id: Ibc87ba76f2135cd8283acd75318f80a95e4b5c45
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 src/corelib/kernel/qabstracteventdispatcher_p.h                 | 2 +-
 src/corelib/kernel/qcoreapplication.cpp                         | 2 +-
 .../corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp    | 2 ++
 .../auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.h | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/corelib/kernel/qabstracteventdispatcher_p.h b/src/corelib/kernel/qabstracteventdispatcher_p.h
index 6fa77c146e2..81ce39ffb80 100644
--- a/src/corelib/kernel/qabstracteventdispatcher_p.h
+++ b/src/corelib/kernel/qabstracteventdispatcher_p.h
@@ -20,7 +20,7 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_CORE_EXPORT uint qGlobalPostedEventsCount();
+Q_AUTOTEST_EXPORT uint qGlobalPostedEventsCount();
 
 class Q_CORE_EXPORT QAbstractEventDispatcherPrivate : public QObjectPrivate
 {
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 9f5d91a4041..1e8b209ff8c 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -321,7 +321,7 @@ Q_CONSTINIT bool QCoreApplicationPrivate::is_app_running = false;
  // app closing down if true
 Q_CONSTINIT bool QCoreApplicationPrivate::is_app_closing = false;
 
-Q_CORE_EXPORT uint qGlobalPostedEventsCount()
+uint qGlobalPostedEventsCount()
 {
     QThreadData *currentThreadData = QThreadData::current();
     return currentThreadData->postEventList.size() - currentThreadData->postEventList.startOffset;
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
index 0e64de151a0..93d81980904 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp
@@ -514,6 +514,7 @@ void tst_QCoreApplication::applicationPid()
     QVERIFY(QCoreApplication::applicationPid() > 0);
 }
 
+#ifdef QT_BUILD_INTERNAL
 class GlobalPostedEventsCountObject : public QObject
 {
     Q_OBJECT
@@ -557,6 +558,7 @@ void tst_QCoreApplication::globalPostedEventsCount()
                           << 0;
     QCOMPARE(x.globalPostedEventsCount, expected);
 }
+#endif // QT_BUILD_INTERNAL
 
 class ProcessEventsAlwaysSendsPostedEventsObject : public QObject
 {
diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.h b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.h
index 728f98f42e0..0894b64f335 100644
--- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.h
+++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.h
@@ -22,7 +22,9 @@ private slots:
     void deliverInDefinedOrder();
 #endif
     void applicationPid();
+#ifdef QT_BUILD_INTERNAL
     void globalPostedEventsCount();
+#endif
     void processEventsAlwaysSendsPostedEvents();
 #ifdef Q_OS_WIN
     void sendPostedEventsInNativeLoop();