Merge remote-tracking branch 'origin/4.9'

Change-Id: I14b3eceebff56c6a0fb07a274baac818f14e0927

1 files changed, 7 insertions, 11 deletions

diff --git a/plugins/haskell/haskellproject.cpp b/plugins/haskell/haskellproject.cpp
index af6b806..bdc3860 100644
--- a/plugins/haskell/haskellproject.cpp
+++ b/plugins/haskell/haskellproject.cpp
@@ -87,17 +87,13 @@ void HaskellProject::updateFiles()
 {
     emitParsingStarted();
     FileName projectDir = projectDirectory();
-    const QList<Core::IVersionControl *> versionControls = Core::VcsManager::versionControls();
-    QFuture<QList<FileNode *>> future = Utils::runAsync([this, projectDir, versionControls] {
-        return FileNode::scanForFilesWithVersionControls(
-            projectDir,
-            [this](const FileName &fn) -> FileNode * {
-                if (fn != FileName::fromString(projectFilePath().toString() + ".user"))
-                    return new FileNode(fn, FileType::Source, false);
-                else
-                    return nullptr;
-            },
-            versionControls);
+    QFuture<QList<FileNode *>> future = Utils::runAsync([this, projectDir] {
+        return FileNode::scanForFiles(projectDir, [this](const FileName &fn) -> FileNode * {
+            if (fn != FileName::fromString(projectFilePath().toString() + ".user"))
+                return new FileNode(fn, FileType::Source, false);
+            else
+                return nullptr;
+        });
     });
     Utils::onResultReady(future, this, [this](const QList<FileNode *> &nodes) {
         auto root = new HaskellProjectNode(projectDirectory(), id());