Merge remote-tracking branch 'origin/4.9'

 Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6

1 files changed, 7 insertions, 7 deletions

diff --git a/src/plugins/clangrefactoring/refactoringprojectupdater.h b/src/plugins/clangrefactoring/refactoringprojectupdater.h
index 8e2652cf23..a9559ef94e 100644
--- a/src/plugins/clangrefactoring/refactoringprojectupdater.h
+++ b/src/plugins/clangrefactoring/refactoringprojectupdater.h
@@ -39,18 +39,18 @@ public:
     RefactoringProjectUpdater(ClangBackEnd::ProjectManagementServerInterface &server,
                               ClangPchManager::PchManagerClient &pchManagerClient,
                               CppTools::CppModelManagerInterface &cppModelManager,
-                              ClangBackEnd::FilePathCachingInterface &filePathCache)
-        : ClangPchManager::ProjectUpdater(server, filePathCache),
-          ClangPchManager::PchManagerNotifierInterface(pchManagerClient),
-          m_cppModelManager(cppModelManager)
+                              ClangBackEnd::FilePathCachingInterface &filePathCache,
+                              ClangBackEnd::ProjectPartsStorageInterface &projectPartsStorage)
+        : ClangPchManager::ProjectUpdater(server, filePathCache, projectPartsStorage)
+        , ClangPchManager::PchManagerNotifierInterface(pchManagerClient)
+        , m_cppModelManager(cppModelManager)
     {
-
     }
 
-    void precompiledHeaderUpdated(const QString &projectPartId,
+    void precompiledHeaderUpdated(ClangBackEnd::ProjectPartId projectPartId,
                                   const QString &pchFilePath,
                                   long long lastModified) override;
-    void precompiledHeaderRemoved(const QString &projectPartId) override;
+    void precompiledHeaderRemoved(ClangBackEnd::ProjectPartId projectPartId) override;
 
 private:
     CppTools::CppModelManagerInterface &m_cppModelManager;