From d90c03ee9ff5d5625e9c85ff5f8a4698024a04d4 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 6 Apr 2016 17:47:28 +0200 Subject: [PATCH] GenericProject: Make initial selection of files work All files where considered to be "out-of-tree" since the base directory was not known at the time the initially marked files were set. Also remove the need to selectAllFiles later by making sure an empty set of initially marked files is treated as "select all files". Change-Id: I5b9745f8afbcc389bed7032b9e76b647f54d681a Reviewed-by: Tim Jenssen --- src/plugins/projectexplorer/selectablefilesmodel.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp index 53131a8d14c..e3f3abe7b5d 100644 --- a/src/plugins/projectexplorer/selectablefilesmodel.cpp +++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp @@ -63,9 +63,7 @@ SelectableFilesModel::SelectableFilesModel(QObject *parent) : QAbstractItemModel void SelectableFilesModel::setInitialMarkedFiles(const Utils::FileNameList &files) { m_files = files.toSet(); - m_outOfBaseDirFiles - = Utils::filtered(m_files, [this](const Utils::FileName &fn) { return !fn.isChildOf(m_baseDir); }); - m_allFiles = false; + m_allFiles = files.isEmpty(); } void SelectableFilesModel::startParsing(const Utils::FileName &baseDir) @@ -95,6 +93,9 @@ void SelectableFilesModel::buildTreeFinished() delete m_root; m_root = m_rootForFuture; m_rootForFuture = nullptr; + m_outOfBaseDirFiles + = Utils::filtered(m_files, [this](const Utils::FileName &fn) { return !fn.isChildOf(m_baseDir); }); + endResetModel(); emit parsingFinished(); } @@ -694,7 +695,6 @@ void SelectableFilesWidget::parsingFinished() if (!m_model) return; - m_model->selectAllFiles(); applyFilter(); smartExpand(m_model->index(0,0, QModelIndex()));