Merge remote-tracking branch 'origin/5.0'

Conflicts:
	src/libs/utils/processreaper.cpp
	src/plugins/clangcodemodel/clangmodelmanagersupport.cpp
	src/plugins/cmakeprojectmanager/cmakeprocess.cpp

Change-Id: Ie248bcb02a80f3e02ab19d73033ce2ba31e7fd83

src/plugins/autotest/quick/quicktestparser.cpp

@@ -312,6 +312,7 @@ void QuickTestParser::handleDirectoryChanged(const QString &directory)
             return filesAndDates.value(file) != watched.value(file);
         });
         if (timestampChanged) {
+            m_watchedFiles[directory] = filesAndDates;
             PathsAndLanguages paths;
             paths.maybeInsert(Utils::FilePath::fromString(directory), Dialect::Qml);
             QFutureInterface<void> future;