forked from qt-creator/qt-creator
QmlDesigner: do not hide kit settings if debug build
Change-Id: I9ea1591d2d088071f951c63212bf551046f944d1 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
@@ -249,16 +249,16 @@ protected:
|
|||||||
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
|
bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const override;
|
||||||
};
|
};
|
||||||
|
|
||||||
const char SETTING_HIDE_OPTION_CATEGORIES[] = "HideOptionCategories";
|
|
||||||
|
|
||||||
static bool categoryVisible(const Id &id)
|
static bool categoryVisible(const Id &id)
|
||||||
{
|
{
|
||||||
|
#ifdef QT_NO_DEBUG
|
||||||
|
|
||||||
static QStringList list
|
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); }))
|
if (anyOf(list, [id](const QString &str) { return id.toString().contains(str); }))
|
||||||
return false;
|
return false;
|
||||||
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -736,8 +736,11 @@ public:
|
|||||||
innerLayout->setSpacing(10);
|
innerLayout->setSpacing(10);
|
||||||
innerLayout->setContentsMargins(PanelsWidget::PanelVMargin, innerLayout->spacing(),
|
innerLayout->setContentsMargins(PanelsWidget::PanelVMargin, innerLayout->spacing(),
|
||||||
PanelsWidget::PanelVMargin, 0);
|
PanelsWidget::PanelVMargin, 0);
|
||||||
|
#ifdef QT_NO_DEBUG
|
||||||
QStringList list = Core::ICore::settings()->value("HideOptionCategories").toStringList();
|
const QStringList list = Core::ICore::settings()->value("HideOptionCategories").toStringList();
|
||||||
|
#else
|
||||||
|
const QStringList list;
|
||||||
|
#endif
|
||||||
if (!list.contains("Kits")) {
|
if (!list.contains("Kits")) {
|
||||||
auto manageKits = new QPushButton(Tr::tr("Manage Kits..."));
|
auto manageKits = new QPushButton(Tr::tr("Manage Kits..."));
|
||||||
connect(manageKits, &QPushButton::clicked,
|
connect(manageKits, &QPushButton::clicked,
|
||||||
@@ -746,7 +749,6 @@ public:
|
|||||||
innerLayout->addWidget(manageKits);
|
innerLayout->addWidget(manageKits);
|
||||||
innerLayout->addSpacerItem(new QSpacerItem(10, 30, QSizePolicy::Maximum, QSizePolicy::Maximum));
|
innerLayout->addSpacerItem(new QSpacerItem(10, 30, QSizePolicy::Maximum, QSizePolicy::Maximum));
|
||||||
}
|
}
|
||||||
|
|
||||||
innerLayout->addWidget(activeLabel);
|
innerLayout->addWidget(activeLabel);
|
||||||
innerLayout->addWidget(m_projectSelection);
|
innerLayout->addWidget(m_projectSelection);
|
||||||
innerLayout->addWidget(m_importBuild);
|
innerLayout->addWidget(m_importBuild);
|
||||||
|
Reference in New Issue
Block a user