From 91cde062968f97041bca8d2a30d13aa03b606c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rn=20Bersvendsen?= Date: Fri, 7 Oct 2016 11:26:04 +0200 Subject: Extracted cleanup from QCoreApplication::exec() into separate function Not all Qt integration points can call QCoreApplication::exec(), in particular, ActiveQt. When an ActiveQt server is loaded, it tries to mimic the behavior of calling QCoreApplication::exec() by setting QCoreApplicationPrivate::in_exec = true. However, when unloading the DLL it is necessary to call the same clean-up (e.g. deferred delete) that QCoreApplication::exec() does. Extracting the cleanup in a separate function means implementation does not have to be duplicated. Task-number: QTBUG-56172 Change-Id: I061f1c06f38881032ad7044416c12c91e536478a Reviewed-by: Andy Shaw Reviewed-by: Friedemann Kleint Reviewed-by: Thiago Macieira --- src/corelib/kernel/qcoreapplication_p.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/corelib/kernel/qcoreapplication_p.h') diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index 445bae01b4..3601add098 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -145,6 +145,8 @@ public: static inline void clearApplicationFilePath() { delete cachedApplicationFilePath; cachedApplicationFilePath = 0; } #ifndef QT_NO_QOBJECT + void execCleanup(); + bool in_exec; bool aboutToQuitEmitted; bool threadData_clean; -- cgit v1.2.3