From cead76f3785857bd401bbd676b6afb8ef1dd5d49 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 2 Jan 2023 16:14:09 +0100 Subject: [PATCH] JSON wizards: Fix "span" with combo boxes Combo boxes have "suppressName" set, but if they have span set too, we still need to use addRow instead of addWidget. Reorder the if conditions. The previous code didn't make much sense, because it first checked for suppressName, and then for hasSpan, but inside hasSpan it checked for (!suppressName) again, which could never be false. You can see this in action in the File > Qt > JS File wizard. Change-Id: I976227f80277642823620e41aba605c8570aed44 Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp index 5e454ffef1a..50b53674065 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp @@ -210,15 +210,15 @@ void JsonFieldPage::Field::createWidget(JsonFieldPage *page) w->setObjectName(name()); QFormLayout *layout = page->layout(); - if (suppressName()) { - layout->addWidget(w); - } else if (hasSpan()) { + if (hasSpan()) { if (!suppressName()) { d->m_label = new QLabel(displayName()); layout->addRow(d->m_label); } layout->addRow(w); + } else if (suppressName()) { + layout->addWidget(w); } else { d->m_label = new QLabel(displayName()); layout->addRow(d->m_label, w);