From e819357bc91afdfe07264e37c3102d786bfe3b96 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Wed, 6 Apr 2016 17:46:04 +0200
Subject: [PATCH] GenericProject: Pass base directory to startParsing(...)
 method

Change-Id: I59645aabac99261526808887e5fe25e575d8d79d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 src/plugins/projectexplorer/selectablefilesmodel.cpp | 8 ++++----
 src/plugins/projectexplorer/selectablefilesmodel.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp
index 24a1d0abcc8..4d2cb8a9738 100644
--- a/src/plugins/projectexplorer/selectablefilesmodel.cpp
+++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp
@@ -560,7 +560,7 @@ SelectableFilesWidget::SelectableFilesWidget(QWidget *parent) :
     connect(m_baseDirChooser, &Utils::PathChooser::validChanged,
             this, &SelectableFilesWidget::baseDirectoryChanged);
     connect(m_startParsingButton, &QAbstractButton::clicked,
-            this, &SelectableFilesWidget::startParsing);
+            this, [this]() { startParsing(m_baseDirChooser->fileName()); });
 
     m_showFilesFilterLabel->setText(tr("Show files matching:"));
     m_showFilesFilterEdit->setText(showFilter);
@@ -641,7 +641,7 @@ void SelectableFilesWidget::resetModel(const Utils::FileName &path, const Utils:
     m_baseDirChooser->setFileName(path);
     m_view->setModel(m_model);
 
-    startParsing();
+    startParsing(path);
 }
 
 void SelectableFilesWidget::cancelParsing()
@@ -675,13 +675,13 @@ void SelectableFilesWidget::baseDirectoryChanged(bool validState)
     m_startParsingButton->setEnabled(validState);
 }
 
-void SelectableFilesWidget::startParsing()
+void SelectableFilesWidget::startParsing(const Utils::FileName &baseDir)
 {
     if (!m_model)
         return;
 
     enableWidgets(false);
-    m_model->startParsing(m_baseDirChooser->fileName());
+    m_model->startParsing(baseDir);
 }
 
 void SelectableFilesWidget::parsingProgress(const Utils::FileName &fileName)
diff --git a/src/plugins/projectexplorer/selectablefilesmodel.h b/src/plugins/projectexplorer/selectablefilesmodel.h
index c1baa921e9c..caee857e095 100644
--- a/src/plugins/projectexplorer/selectablefilesmodel.h
+++ b/src/plugins/projectexplorer/selectablefilesmodel.h
@@ -176,7 +176,7 @@ private:
     void applyFilter();
     void baseDirectoryChanged(bool validState);
 
-    void startParsing();
+    void startParsing(const Utils::FileName &baseDir);
     void parsingProgress(const Utils::FileName &fileName);
     void parsingFinished();