aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmljseditor
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2024-04-02 14:54:30 +0200
committerEike Ziller <eike.ziller@qt.io>2024-04-02 14:54:30 +0200
commit309a01337fb0ddb6e26de1ae25c9ae852fc29b53 (patch)
tree893b330613c5e82f3b1a5c280e0dde06a268139a /src/plugins/qmljseditor
parenta8b7f6c29162b6a062b285103de5cde52139f3a7 (diff)
parentb887825661ab91bd027b18a10e1f0ec03840730c (diff)
Merge remote-tracking branch 'origin/13.0'
Diffstat (limited to 'src/plugins/qmljseditor')
-rw-r--r--src/plugins/qmljseditor/qmljshoverhandler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/qmljseditor/qmljshoverhandler.cpp b/src/plugins/qmljseditor/qmljshoverhandler.cpp
index 9dcc220e25..650592ff48 100644
--- a/src/plugins/qmljseditor/qmljshoverhandler.cpp
+++ b/src/plugins/qmljseditor/qmljshoverhandler.cpp
@@ -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());