From 2f50deafbf7320d5a122ae437d6dbff422961336 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 29 Feb 2024 14:18:04 +0000 Subject: [PATCH] Revert "Fix export of QDeferredDeleteEvent, should be Q_CORE_EXPORT" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bc3b18764aabf95a50a65e090863c54b6ac57e3e. Reason for revert: QDeferredDeleteEvent changed the size in 6.7. It is more important to protect the casual user that relied on the mention of the otherwise undocumented class in the QEvent::Type::DeferredDelete documentation than to be convenient for one tool, developed by experts who know how to replace their dynamic_cast with a type() check and a static_cast and/or extract information from an unexported class. In fact, not even the autotest-export is needed, as there are no mentions of the class outside of comments outside QtCore. Found in API-review. [ChangeLog][QtCore][QDeferredDeleteEvent] Made this undocumented class private and unexported. You will still be able to see the definition in qcoreevent_p.h, but you won't be able to create objects of the class anymore. Manual conflict resolutions: - squash the tst_qapplication.cpp part of dev-only 13074a967f18ed348ab744f7ff831965607a6421 to avoid the linker error. Change-Id: I8a47c69d356a0bef260e7987bc4eab96430e8072 Reviewed-by: David Faure Reviewed-by: Volker Hilsheimer (cherry picked from commit e06c67d448a6b4684d9787e9c18ec12f884b7063) Reviewed-by: Tor Arne Vestbø --- src/corelib/kernel/qcoreevent_p.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/kernel/qcoreevent_p.h b/src/corelib/kernel/qcoreevent_p.h index 3a21e845605..15e908ebad9 100644 --- a/src/corelib/kernel/qcoreevent_p.h +++ b/src/corelib/kernel/qcoreevent_p.h @@ -21,8 +21,7 @@ QT_BEGIN_NAMESPACE class QCoreApplication; -// GammaRay needs this to be exported with Q_CORE_EXPORT -class Q_CORE_EXPORT QDeferredDeleteEvent : public QEvent +class QDeferredDeleteEvent : public QEvent { Q_DECL_EVENT_COMMON(QDeferredDeleteEvent) public: