Merge remote-tracking branch 'origin/3.6'

Conflicts:
	src/plugins/projectexplorer/toolchainmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: Id736c6922670c921c689219cb817b1541eaaf304

src/plugins/cpptools/cppmodelmanager.cpp

@@ -936,7 +936,7 @@ ProjectPart::Ptr CppModelManager::fallbackProjectPart()
     return part;
 }
 
-bool CppModelManager::isCppEditor(Core::IEditor *editor) const
+bool CppModelManager::isCppEditor(Core::IEditor *editor)
 {
     return editor->context().contains(ProjectExplorer::Constants::LANG_CXX);
 }

src/plugins/cpptools/cppmodelmanager.h

@@ -91,6 +91,7 @@ public:
 
     QFuture<void> updateSourceFiles(const QSet<QString> &sourceFiles,
         ProgressNotificationMode mode = ReservedProgressNotification);
+    void updateCppEditorDocuments() const;
     WorkingCopy workingCopy() const;
     QByteArray codeModelConfiguration() const;
 
@@ -120,7 +121,7 @@ public:
                                                   const QByteArray &contents);
     void emitAbstractEditorSupportRemoved(const QString &filePath);
 
-    bool isCppEditor(Core::IEditor *editor) const;
+    static bool isCppEditor(Core::IEditor *editor);
     bool isClangCodeModelAvailable() const;
     bool isClangCodeModelActive() const;
 
@@ -209,7 +210,6 @@ private:
     void initializeModelManagerSupports();
     void delayedGC();
     void recalculateProjectPartMappings();
-    void updateCppEditorDocuments() const;
 
     void replaceSnapshot(const CPlusPlus::Snapshot &newSnapshot);
     void removeFilesFromSnapshot(const QSet<QString> &removedFiles);

src/plugins/cpptools/cppprojects.h

@@ -247,6 +247,4 @@ private:
 
 } // namespace CppTools
 
-Q_DECLARE_METATYPE(CppTools::ProjectPart::Ptr)
-
 #endif // CPPPROJECTPART_H

src/plugins/cpptools/cpptools_global.h

@@ -35,6 +35,8 @@
 
 #if defined(CPPTOOLS_LIBRARY)
 #  define CPPTOOLS_EXPORT Q_DECL_EXPORT
+#elif defined(CPPTOOLS_STATIC_LIBRARY)
+#  define CPPTOOLS_EXPORT
 #else
 #  define CPPTOOLS_EXPORT Q_DECL_IMPORT
 #endif

src/plugins/cpptools/cpptoolsunittestfiles.pri

@@ -1,3 +1,9 @@
+contains(CONFIG, dll) {
+    DEFINES += CPPTOOLS_LIBRARY
+} else {
+    DEFINES += CPPTOOLS_STATIC_LIBRARY
+}
+
 HEADERS += $$PWD/senddocumenttracker.h
 
 SOURCES += $$PWD/senddocumenttracker.cpp