Merge remote-tracking branch 'origin/12.0'

Conflicts:
	src/plugins/cppeditor/cppfilesettingspage.cpp
	src/plugins/haskell/haskellplugin.h

Change-Id: I880693c2e4986853b7aa600a5b7d6c09ad14634e

src/plugins/autotoolsprojectmanager/autotoolsprojectplugin.cpp

@@ -93,6 +93,7 @@ class AutotoolsProjectPlugin final : public ExtensionSystem::IPlugin
 
     void initialize() final
     {
+        ProjectManager::registerProjectType<AutotoolsProject>(Utils::Constants::MAKEFILE_MIMETYPE);
         d = std::make_unique<AutotoolsProjectPluginPrivate>();
     }