From 47b99a474c532be281d968a67ee79bc4574eeb2b Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Tue, 5 Jul 2022 08:55:03 +0200 Subject: [PATCH] Revert "QFutureCallOutEvent: de-export again" QFutureCallOutEvent is used externally, so it needs to be exported. This reverts commit 3141a13b2a5c3cf770e072e49d43c86f376688e5. Fixes: QTBUG-104732 Change-Id: I82c9e7414192ee948f78259bd74a404691a7805a Reviewed-by: Volker Hilsheimer Reviewed-by: Marc Mutz (cherry picked from commit 6ad481c31f7a4658e185dd9c6832b81d91d5a1ec) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/thread/qfutureinterface_p.h | 6 +++++- tests/auto/gui/kernel/qevent/tst_qevent.cpp | 8 +------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/corelib/thread/qfutureinterface_p.h b/src/corelib/thread/qfutureinterface_p.h index 9bf87d4db38..ec3517bab36 100644 --- a/src/corelib/thread/qfutureinterface_p.h +++ b/src/corelib/thread/qfutureinterface_p.h @@ -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: diff --git a/tests/auto/gui/kernel/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp index 0ad8a60beaa..5420a5bd5f6 100644 --- a/tests/auto/gui/kernel/qevent/tst_qevent.cpp +++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp @@ -8,12 +8,6 @@ #include #include -#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) \