Merge remote-tracking branch 'origin/9.0'

 Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp

Change-Id: I154a9ababa9e166cb06e98652d481fe6234f6399

3 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/projectexplorer/buildconfiguration.h b/src/plugins/projectexplorer/buildconfiguration.h
index 59649e5def..815daeda6b 100644
--- a/src/plugins/projectexplorer/buildconfiguration.h
+++ b/src/plugins/projectexplorer/buildconfiguration.h
@@ -116,6 +116,7 @@ public:
 
 signals:
     void environmentChanged();
+    void buildDirectoryInitialized();
     void buildDirectoryChanged();
     void enabledChanged();
     void buildTypeChanged();
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index 4c2904d3cd..8b072f85eb 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -157,7 +157,6 @@ QList<Utils::OutputLineParser *> CustomToolChain::createOutputParsers() const
     if (m_outputParserId == MsvcParser::id())
         return {new MsvcParser};
     return {new Internal::CustomParser(customParserSettings())};
-    return {};
 }
 
 QStringList CustomToolChain::headerPathsList() const
diff --git a/src/plugins/projectexplorer/treescanner.cpp b/src/plugins/projectexplorer/treescanner.cpp
index 6e7e25fe9b..747a4d1ddc 100644
--- a/src/plugins/projectexplorer/treescanner.cpp
+++ b/src/plugins/projectexplorer/treescanner.cpp
@@ -45,8 +45,9 @@ bool TreeScanner::asyncScanForFiles(const Utils::FilePath &directory)
     if (!m_futureWatcher.isFinished())
         return false;
 
-    m_scanFuture = Utils::runAsync([this, directory](FutureInterface &fi) {
-        TreeScanner::scanForFiles(fi, directory, m_filter, m_factory);
+    m_scanFuture = Utils::runAsync(
+                [directory, filter = m_filter, factory = m_factory] (FutureInterface &fi) {
+        TreeScanner::scanForFiles(fi, directory, filter, factory);
     });
     m_futureWatcher.setFuture(m_scanFuture);