sync: from linuxdeepin/dtkdeclarative

deepin-ci-robot · deepin-ci-robot · commit ebbf276b8eba · 2024-08-21T06:56:42.000Z
Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: linuxdeepin/dtkdeclarative#385
diff --git a/src/private/dquickcontrolpalette.cpp b/src/private/dquickcontrolpalette.cpp
@@ -947,6 +947,10 @@ void DQuickControlColorSelector::updatePropertyFromName(const QByteArray &name,
     } else {
         color = getColorOf(name, m_state.data());
     }
+
+    if (!palette && !color.isValid())
+        return;
+
     m_metaObject->setValue(name, color);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -947,6 +947,10 @@ void DQuickControlColorSelector::updatePropertyFromName(const QByteArray &name,`
`947`	`947`	`} else {`
`948`	`948`	`color = getColorOf(name, m_state.data());`
`949`	`949`	`}`
	`950`	`+`
	`951`	`+ if (!palette && !color.isValid())`
	`952`	`+ return;`
	`953`	`+`
`950`	`954`	`m_metaObject->setValue(name, color);`
`951`	`955`	`}`
`952`	`956`