forked from qt-creator/qt-creator
QmlDesigner: Fix NodeHint in PS builds
m_modelNode needs to be set also in project storage builds to properly resolve hints. Fixes: QDS-14763 Change-Id: I789d170f8904708e965a8beedaac79a3f56dae02 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
@@ -71,10 +71,9 @@ static QVariant evaluateExpression(const QString &expression, const ModelNode &m
|
||||
QmlDesigner::NodeHints::NodeHints(const ModelNode &node)
|
||||
#ifdef QDS_USE_PROJECTSTORAGE
|
||||
: NodeHints{node.metaInfo()}
|
||||
#else
|
||||
: m_modelNode(node)
|
||||
#endif
|
||||
{
|
||||
m_modelNode = node;
|
||||
#ifndef QDS_USE_PROJECTSTORAGE
|
||||
|
||||
if (!isValid())
|
||||
@@ -124,7 +123,7 @@ NodeHints::NodeHints(const ItemLibraryEntry &entry, [[maybe_unused]] Model *mode
|
||||
namespace {
|
||||
bool convert(FlagIs flagIs)
|
||||
{
|
||||
return flagIs == FlagIs::True ? true : false;
|
||||
return flagIs == FlagIs::True;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
@@ -326,7 +325,7 @@ bool NodeHints::hideInNavigator() const
|
||||
if (!isValid())
|
||||
return false;
|
||||
|
||||
auto flagIs = m_modelNode.metaInfo().hideInNavigator();
|
||||
auto flagIs = m_metaInfo.hideInNavigator();
|
||||
|
||||
if (flagIs != FlagIs::Set)
|
||||
return convert(flagIs);
|
||||
|
Reference in New Issue
Block a user