Merge remote-tracking branch 'origin/4.12'

 Conflicts:
	src/plugins/cmakeprojectmanager/tealeafreader.cpp
	src/plugins/cmakeprojectmanager/tealeafreader.h
	src/plugins/projectexplorer/miniprojecttargetselector.cpp

Change-Id: I88d85be3903f57a55fddb7901e771a4822db1b85

1 files changed, 3 insertions, 3 deletions

diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp
index 2345a89076..a6cacabaa2 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildsystem.cpp
@@ -110,7 +110,7 @@ void AutotoolsBuildSystem::makefileParsingFinished()
 
     m_files.clear();
 
-    QVector<Utils::FilePath> filesToWatch;
+    QSet<Utils::FilePath> filesToWatch;
 
     // Apply sources to m_files, which are returned at AutotoolsBuildSystem::files()
     const QFileInfo fileInfo = projectFilePath().toFileInfo();
@@ -127,7 +127,7 @@ void AutotoolsBuildSystem::makefileParsingFinished()
 
         m_files.append(absMakefile);
 
-        filesToWatch.append(Utils::FilePath::fromString(absMakefile));
+        filesToWatch.insert(Utils::FilePath::fromString(absMakefile));
     }
 
     // Add configure.ac file to project and watch for changes.
@@ -137,7 +137,7 @@ void AutotoolsBuildSystem::makefileParsingFinished()
         const QString absConfigureAc = dir.absoluteFilePath(configureAc);
         m_files.append(absConfigureAc);
 
-        filesToWatch.append(Utils::FilePath::fromString(absConfigureAc));
+        filesToWatch.insert(Utils::FilePath::fromString(absConfigureAc));
     }
 
     auto newRoot = std::make_unique<ProjectNode>(project()->projectDirectory());