Merge branch 'master' into topic-update-nosync

linuxdeepin · Nov 22, 2024 · 0a112f5 · 0a112f5
2 parents 123bf39 + 7733998
commit 0a112f5
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/private/dquickcontrolpalette.cpp b/src/private/dquickcontrolpalette.cpp
@@ -18,6 +18,7 @@
 #include <private/qqmlopenmetaobject_p.h>
 #include <private/qqmlglobal_p.h>
 #include <private/qmetaobjectbuilder_p.h>
+#include <private/qcoreapplication_p.h>
 
 DGUI_USE_NAMESPACE
 DQUICK_BEGIN_NAMESPACE
@@ -938,7 +939,9 @@ void DQuickControlColorSelector::notifyColorPropertyChanged()
 
 void DQuickControlColorSelector::updatePropertyFromName(const QByteArray &name, const DQuickControlPalette *palette)
 {
-    if (QCoreApplication::closingDown())
+    auto appriv = dynamic_cast<QCoreApplicationPrivate *>(QObjectPrivate::get(qApp));
+    Q_ASSERT(appriv);
+    if (QCoreApplication::closingDown() || !appriv || appriv->aboutToQuitEmitted)
         return;
     Q_ASSERT(!name.isEmpty());
     QColor color;