summaryrefslogtreecommitdiffstats
path: root/src/core/aspects/qabstractaspect.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-03-01 12:55:00 +0000
committerSean Harmer <sean.harmer@kdab.com>2016-03-20 11:07:10 +0000
commit64c1c03f406c2a5c0838bff7f7d180ca1acb0408 (patch)
tree7b318a837480c873015cc5daa58f05d4a9310201 /src/core/aspects/qabstractaspect.cpp
parent83b3aecb98a5ef74ba405d3d96b0d586db7baba4 (diff)
Add QAbstractAspectPrivate::onEngineAboutToShutdown() virtual
Gives internal aspects a chance to unqueue any queued work that could potentially deadlock during trying to exit the inner loop in QAspectManager::exec(). Task-number: QTBUG-51421 Change-Id: I8f9892db2d8648c39092720f1a787c4db412d30d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/aspects/qabstractaspect.cpp')
-rw-r--r--src/core/aspects/qabstractaspect.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp
index 309fa3faf..20a393738 100644
--- a/src/core/aspects/qabstractaspect.cpp
+++ b/src/core/aspects/qabstractaspect.cpp
@@ -68,6 +68,14 @@ QAbstractAspectPrivate *QAbstractAspectPrivate::get(QAbstractAspect *aspect)
}
/*!
+ *
+ * Called in the context of the main thread
+ */
+void QAbstractAspectPrivate::onEngineAboutToShutdown()
+{
+}
+
+/*!
\class Qt3DCore::QAbstractAspect
\inmodule Qt3DCore
\brief QAbstractAspect is the base class for aspects that provide a vertical slice of behavior.