ui: Removed include check validation for cdb source groups

This commit is contained in:
Eberhard Graether
2017-10-09 21:38:04 +02:00
parent 3a03252d3f
commit e3a6c3257e
3 changed files with 18 additions and 7 deletions
+7 -2
View File
@@ -46,14 +46,19 @@ std::vector<IncludeDirective> IncludeValidation::getUnresolvedIncludeDirectives(
while (!unprocessedFilePaths.empty())
{
std::transform(unprocessedFilePaths.begin(), unprocessedFilePaths.end(), std::inserter(processedFilePaths, processedFilePaths.begin()), [](const FilePath& p){ return p.str(); });
std::transform(
unprocessedFilePaths.begin(), unprocessedFilePaths.end(),
std::inserter(processedFilePaths, processedFilePaths.begin()),
[](const FilePath& p){ return p.str(); }
);
std::set<FilePath> tempUnprocessedFilePaths;
for (const FilePath& filePath: unprocessedFilePaths)
{
for (const IncludeDirective& includeDirective: getIncludeDirectives(filePath))
{
const FilePath resolvedIncludePath = resolveIncludeDirective(includeDirective, headerSearchDirectories);
const FilePath resolvedIncludePath =
resolveIncludeDirective(includeDirective, headerSearchDirectories).canonical();
if (resolvedIncludePath.empty())
{
unresolvedIncludeDirectives.insert(includeDirective);
@@ -354,6 +354,7 @@ QtProjectWizzardContentPathsHeaderSearch::QtProjectWizzardContentPathsHeaderSear
)
: QtProjectWizzardContentPaths(settings, window)
, m_showValidationResultFunctor(std::bind(&QtProjectWizzardContentPathsHeaderSearch::showValidationResult, this, std::placeholders::_1))
, m_isCdb(isCDB)
{
setTitleString(isCDB ? "Additional Include Paths" : "Include Paths");
setHelpString(
@@ -375,12 +376,15 @@ void QtProjectWizzardContentPathsHeaderSearch::populate(QGridLayout* layout, int
{
QtProjectWizzardContentPaths::populate(layout, row);
QPushButton* button = new QPushButton("validate include directives");
button->setObjectName("windowButton");
connect(button, &QPushButton::clicked, this, &QtProjectWizzardContentPathsHeaderSearch::validateButtonClicked);
if (!m_isCdb)
{
QPushButton* button = new QPushButton("validate include directives");
button->setObjectName("windowButton");
connect(button, &QPushButton::clicked, this, &QtProjectWizzardContentPathsHeaderSearch::validateButtonClicked);
layout->addWidget(button, row, QtProjectWizzardWindow::BACK_COL, Qt::AlignRight | Qt::AlignTop);
row++;
layout->addWidget(button, row, QtProjectWizzardWindow::BACK_COL, Qt::AlignRight | Qt::AlignTop);
row++;
}
}
void QtProjectWizzardContentPathsHeaderSearch::load()
@@ -119,6 +119,8 @@ private slots:
private:
void showValidationResult(const std::vector<IncludeDirective>& unresolvedIncludes);
QtThreadedFunctor<std::vector<IncludeDirective>> m_showValidationResultFunctor;
bool m_isCdb;
};
class QtProjectWizzardContentPathsHeaderSearchGlobal