Merge remote-tracking branch 'origin/3.2'

Conflicts:
	src/plugins/git/changeselectiondialog.cpp
	src/plugins/git/changeselectiondialog.h
	src/plugins/git/gerrit/gerritplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/git/gitclient.h
	src/plugins/git/gitsettings.cpp
	src/plugins/git/gitsettings.h
	src/plugins/git/mergetool.cpp

Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791

src/plugins/cmakeprojectmanager/CMakeProjectManager.mimetypes.xml

@@ -3,7 +3,11 @@
   <mime-type type="text/x-cmake">
     <sub-class-of type="text/plain"/>
     <comment>CMake Project file</comment>
-    <glob pattern="CMakeLists.txt"/>
     <glob pattern="*.cmake"/>
   </mime-type>
+  <mime-type type="text/x-cmake-project">
+    <sub-class-of type="text/plain"/>
+    <comment>CMake Project file</comment>
+    <glob pattern="CMakeLists.txt"/>
+  </mime-type>
 </mime-info>

src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp

@@ -140,7 +140,7 @@ QList<ProjectExplorer::BuildInfo *> CMakeBuildConfigurationFactory::availableBui
 int CMakeBuildConfigurationFactory::priority(const ProjectExplorer::Kit *k, const QString &projectPath) const
 {
     return (k && Core::MimeDatabase::findByFile(QFileInfo(projectPath))
-            .matchesType(QLatin1String(Constants::CMAKEMIMETYPE))) ? 0 : -1;
+            .matchesType(QLatin1String(Constants::CMAKEPROJECTMIMETYPE))) ? 0 : -1;
 }
 
 QList<ProjectExplorer::BuildInfo *> CMakeBuildConfigurationFactory::availableSetups(const ProjectExplorer::Kit *k,

src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp

@@ -51,6 +51,7 @@ CMakeEditorFactory::CMakeEditorFactory(CMakeManager *manager)
     setId(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
     setDisplayName(tr(CMakeProjectManager::Constants::CMAKE_EDITOR_DISPLAY_NAME));
     addMimeType(CMakeProjectManager::Constants::CMAKEMIMETYPE);
+    addMimeType(CMakeProjectManager::Constants::CMAKEPROJECTMIMETYPE);
 
     new TextEditorActionHandler(this, Constants::C_CMAKEEDITOR,
             TextEditorActionHandler::UnCommentSelection

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -774,7 +774,7 @@ CMakeFile::CMakeFile(CMakeProject *parent, QString fileName)
     : Core::IDocument(parent), m_project(parent)
 {
     setId("Cmake.ProjectFile");
-    setMimeType(QLatin1String(Constants::CMAKEMIMETYPE));
+    setMimeType(QLatin1String(Constants::CMAKEPROJECTMIMETYPE));
     setFilePath(fileName);
 }
 
@@ -830,7 +830,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
     setLayout(fl);
 
-    QPushButton *runCmakeButton = new QPushButton(tr("Run cmake..."));
+    QPushButton *runCmakeButton = new QPushButton(tr("Run CMake..."));
     connect(runCmakeButton, SIGNAL(clicked()),
             this, SLOT(runCMake()));
     fl->addRow(tr("Reconfigure project:"), runCmakeButton);

src/plugins/cmakeprojectmanager/cmakeprojectconstants.h

@@ -35,6 +35,7 @@ namespace Constants {
 
 const char PROJECTCONTEXT[] = "CMakeProject.ProjectContext";
 const char CMAKEMIMETYPE[]  = "text/x-cmake";
+const char CMAKEPROJECTMIMETYPE[]  = "text/x-cmake-project";
 const char CMAKE_EDITOR_ID[] = "CMakeProject.CMakeEditor";
 const char CMAKE_EDITOR_DISPLAY_NAME[] = "CMake Editor";
 const char C_CMAKEEDITOR[] = "CMakeProject.Context.CMakeEditor";

src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

@@ -135,7 +135,7 @@ ProjectExplorer::Project *CMakeManager::openProject(const QString &fileName, QSt
 
 QString CMakeManager::mimeType() const
 {
-    return QLatin1String(Constants::CMAKEMIMETYPE);
+    return QLatin1String(Constants::CMAKEPROJECTMIMETYPE);
 }
 
 QString CMakeManager::cmakeExecutable() const

src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp

@@ -88,6 +88,7 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString *
     hf->setProductType<CMakeHighlighter>();
     hf->setId(CMakeProjectManager::Constants::CMAKE_EDITOR_ID);
     hf->addMimeType(CMakeProjectManager::Constants::CMAKEMIMETYPE);
+    hf->addMimeType(CMakeProjectManager::Constants::CMAKEPROJECTMIMETYPE);
     addAutoReleasedObject(hf);
 
     return true;