Revert "QFutureCallOutEvent: de-export again"

QFutureCallOutEvent is used externally, so it needs to be exported.

This reverts commit 3141a13b2a.

Fixes: QTBUG-104732
Pick-to: 6.4
Change-Id: I82c9e7414192ee948f78259bd74a404691a7805a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
Sona Kurazyan 2022-07-05 08:55:03 +02:00
parent edee40a179
commit 6ad481c31f
2 changed files with 6 additions and 8 deletions

View File

@ -29,7 +29,11 @@ QT_REQUIRE_CONFIG(future);
QT_BEGIN_NAMESPACE
class Q_AUTOTEST_EXPORT QFutureCallOutEvent : public QEvent
// Although QFutureCallOutEvent and QFutureCallOutInterface are private,
// for historical reasons they were used externally (in QtJambi, see
// https://github.com/OmixVisualization/qtjambi), so we export them to
// not break the pre-existing code.
class Q_CORE_EXPORT QFutureCallOutEvent : public QEvent
{
Q_DECL_EVENT_COMMON(QFutureCallOutEvent)
public:

View File

@ -8,12 +8,6 @@
#include <QtGui/qevent.h>
#include <QtCore/private/qfutureinterface_p.h>
#ifdef QT_BUILD_INTERNAL
# define ONLY_IF_INTERNAL_BUILD(...) __VA_ARGS__
#else
# define ONLY_IF_INTERNAL_BUILD(...)
#endif
#define FOR_EACH_CORE_EVENT(X) \
/* qcoreevent.h */ \
X(QEvent, (QEvent::None)) \
@ -22,7 +16,7 @@
X(QDynamicPropertyChangeEvent, ("size")) \
X(QDeferredDeleteEvent, ()) \
/* qfutureinterface_p.h */ \
ONLY_IF_INTERNAL_BUILD(X(QFutureCallOutEvent, ())) \
X(QFutureCallOutEvent, ()) \
/* end */
#define FOR_EACH_GUI_EVENT(X) \