Merge remote-tracking branch 'origin/10.0'

Conflicts:
	src/plugins/clangcodemodel/clangcodemodelplugin.cpp

Change-Id: Idb3d6e8fdfd278979f6180dc3795a2138bc2e61d

src/plugins/clangcodemodel/clangcodemodelplugin.h

@@ -11,8 +11,7 @@
 
 #include <QFutureWatcher>
 
-namespace ClangCodeModel {
-namespace Internal {
+namespace ClangCodeModel::Internal {
 
 class ClangCodeModelPlugin final: public ExtensionSystem::IPlugin
 {
@@ -29,10 +28,6 @@ private:
 
     Utils::ParameterAction *m_generateCompilationDBAction = nullptr;
     QFutureWatcher<GenerateCompilationDbResult> m_generatorWatcher;
-#ifdef WITH_TESTS
-    QVector<QObject *> createTestObjects() const override;
-#endif
 };
 
-} // namespace Internal
-} // namespace Clang
+} // ClangCodeModel::Internal