feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.9'

Browse Source 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/debugger/debuggerkitinformation.cpp
	src/plugins/languageclient/languageclientmanager.cpp
	src/plugins/plugins.pro
	src/plugins/projectexplorer/kit.cpp
	src/plugins/projectexplorer/kitmanager.cpp

Change-Id: I66fb941202991f35f7d7761430b21e42dfc678a8
This commit is contained in:
Eike Ziller
2019-03-14 15:14:40 +01:00
parent 62cafc1782 429eb73ace
commit c53ccceff1
154 changed files with 2211 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
View File

@@ -860,11 +860,11 @@ void ClangDiagnosticConfigsWidget::syncClazyChecksGroupBox()
return !m_clazySortFilterProxyModel->filterAcceptsRow(index.row(), index.parent());
};
const bool hasEnabledButHidden = m_clazyTreeModel->hasEnabledButNotVisibleChecks(isHidden);
const QString title = hasEnabledButHidden ? tr("Checks (%1 enabled, some are filtered out)")
: tr("Checks (%1 enabled)");
const QStringList checks = m_clazyTreeModel->enabledChecks();
m_clazyChecks->checksGroupBox->setTitle(title.arg(checks.count()));
const int checksCount = m_clazyTreeModel->enabledChecks().count();
const QString title = hasEnabledButHidden ? tr("Checks (%n enabled, some are filtered out)",
nullptr, checksCount)
: tr("Checks (%n enabled)", nullptr, checksCount);
m_clazyChecks->checksGroupBox->setTitle(title);
}
void ClangDiagnosticConfigsWidget::updateConfig(const ClangDiagnosticConfig &config)