Merge remote-tracking branch 'origin/13.0'

Change-Id: I12578a55fb61a3a9620c749c0b3bbbae6dcb4493
This commit is contained in:
Eike Ziller
2024-04-02 14:54:30 +02:00
53 changed files with 176 additions and 161 deletions

View File

@@ -294,7 +294,9 @@ bool QmlJSHoverHandler::matchColorItem(const ScopeChain &scopeChain,
if (auto binding = AST::cast<const AST::UiScriptBinding *>(member)) {
if (binding->qualifiedId && posIsInSource(pos, binding->statement)) {
value = scopeChain.evaluate(binding->qualifiedId);
if (value && value->asColorValue()) {
if (value && (value->asColorValue()
|| (value->asCppComponentValue()
&& value->asCppComponentValue()->className() == "color"))) {
color = textAt(qmlDocument,
binding->statement->firstSourceLocation(),
binding->statement->lastSourceLocation());