From acb7ef39aa0a06af7705d147a167a1e20e9a197d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Jen=C3=9Fen?= Date: Mon, 12 Aug 2024 10:54:36 +0200 Subject: [PATCH] QmlDesigner: do not hide kit settings if debug build Change-Id: I9ea1591d2d088071f951c63212bf551046f944d1 Reviewed-by: Thomas Hartmann --- src/plugins/coreplugin/dialogs/settingsdialog.cpp | 8 ++++---- src/plugins/projectexplorer/projectwindow.cpp | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp index 74fe67d8175..440912efdef 100644 --- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp +++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp @@ -249,16 +249,16 @@ protected: bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override; }; -const char SETTING_HIDE_OPTION_CATEGORIES[] = "HideOptionCategories"; - static bool categoryVisible(const Id &id) { +#ifdef QT_NO_DEBUG + static QStringList list - = Core::ICore::settings()->value(SETTING_HIDE_OPTION_CATEGORIES).toStringList(); + = Core::ICore::settings()->value("HideOptionCategories").toStringList(); if (anyOf(list, [id](const QString &str) { return id.toString().contains(str); })) return false; - +#endif return true; } diff --git a/src/plugins/projectexplorer/projectwindow.cpp b/src/plugins/projectexplorer/projectwindow.cpp index c3214b64984..702c68f652e 100644 --- a/src/plugins/projectexplorer/projectwindow.cpp +++ b/src/plugins/projectexplorer/projectwindow.cpp @@ -736,8 +736,11 @@ public: innerLayout->setSpacing(10); innerLayout->setContentsMargins(PanelsWidget::PanelVMargin, innerLayout->spacing(), PanelsWidget::PanelVMargin, 0); - - QStringList list = Core::ICore::settings()->value("HideOptionCategories").toStringList(); +#ifdef QT_NO_DEBUG + const QStringList list = Core::ICore::settings()->value("HideOptionCategories").toStringList(); +#else + const QStringList list; +#endif if (!list.contains("Kits")) { auto manageKits = new QPushButton(Tr::tr("Manage Kits...")); connect(manageKits, &QPushButton::clicked, @@ -746,7 +749,6 @@ public: innerLayout->addWidget(manageKits); innerLayout->addSpacerItem(new QSpacerItem(10, 30, QSizePolicy::Maximum, QSizePolicy::Maximum)); } - innerLayout->addWidget(activeLabel); innerLayout->addWidget(m_projectSelection); innerLayout->addWidget(m_importBuild);