From c216dff156e3715e1ab1262229df20ef7598f654 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 13 Sep 2023 17:30:26 +0200 Subject: [PATCH] QmlDesigner: Show default condition as empty MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I33f217bf02035414b2d69c863c7039c485161579 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Henning Gründl --- .../connectioneditor/connectionmodel.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp index 838e1d587dd..15ab1341a38 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionmodel.cpp @@ -27,6 +27,8 @@ namespace { +const char defaultCondition[] = "condition"; + QStringList propertyNameListToStringList(const QmlDesigner::PropertyNameList &propertyNameList) { QStringList stringList; @@ -693,7 +695,7 @@ void ConnectionModelBackendDelegate::addCondition() ConnectionEditorStatements::MatchedCondition newCondition; ConnectionEditorStatements::Variable variable; - variable.nodeId = "condition"; + variable.nodeId = defaultCondition; newCondition.statements.append(variable); ConnectionEditorStatements::ConditionalStatement conditionalStatement; @@ -1067,8 +1069,6 @@ void ConnectionModelBackendDelegate::handleConditionChanged() condition = m_conditionListModel.condition(); //why? QString newSource = ConnectionEditorStatements::toJavascript(m_handler); - qDebug() << Q_FUNC_INFO << "new source" << newSource; - commitNewSource(newSource); } @@ -1830,6 +1830,12 @@ void ConditionListModel::internalSetup() if (m_condition.statements.size() != m_condition.tokens.size() + 1) return; + if (m_condition.statements.size() == 1 && m_condition.tokens.isEmpty()) { + auto token = tokenFromComparativeStatement(m_condition.statements.first()); + if (token.value == defaultCondition) + return; + } + auto s_it = m_condition.statements.begin(); auto o_it = m_condition.tokens.begin(); @@ -1842,9 +1848,6 @@ void ConditionListModel::internalSetup() } m_tokens.append(tokenFromComparativeStatement(*s_it)); - for (const auto &token : m_tokens) - qDebug() << token.value; - setValid(); }