Merge remote-tracking branch 'origin/4.13' into master

Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
	src/plugins/cmakeprojectmanager/cmakebuildstep.h
	tests/auto/debugger/tst_namedemangler.cpp
	tests/auto/qml/codemodel/check/tst_check.cpp

Change-Id: Iefd5f71c03c0078513b76a92af764a4fb22ee4c2

src/plugins/git/gitclient.cpp

@@ -1448,10 +1448,13 @@ bool GitClient::synchronousLog(const QString &workingDirectory, const QStringLis
     }
 }
 
-bool GitClient::synchronousAdd(const QString &workingDirectory, const QStringList &files)
+bool GitClient::synchronousAdd(const QString &workingDirectory,
+                               const QStringList &files,
+                               const QStringList &extraOptions)
 {
-    return vcsFullySynchronousExec(workingDirectory, QStringList({"add"}) + files).result
-            == SynchronousProcessResponse::Finished;
+    QStringList args{"add"};
+    args += extraOptions + files;
+    return vcsFullySynchronousExec(workingDirectory, args).result == SynchronousProcessResponse::Finished;
 }
 
 bool GitClient::synchronousDelete(const QString &workingDirectory,
@@ -2899,7 +2902,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
             filesToReset.removeAll(file);
             filesToAdd.append(file);
         } else if (state == AddedFile && checked) {
-            QTC_ASSERT(false, continue); // these should be untracked!
+            filesToAdd.append(file);
         } else if (state == DeletedFile && checked) {
             filesToReset.removeAll(file);
             filesToRemove.append(file);
@@ -3598,7 +3601,7 @@ void GitClient::StashInfo::stashPrompt(const QString &command, const QString &st
                                        QString *errorMessage)
 {
     QMessageBox msgBox(QMessageBox::Question, tr("Uncommitted Changes Found"),
-                       tr("What would you like to do with local changes in:") + "\n\n"
+                       tr("What would you like to do with local changes in:") + "\n\n\""
                        + QDir::toNativeSeparators(m_workingDir) + '\"',
                        QMessageBox::NoButton, ICore::dialogParent());
 

src/plugins/git/gitclient.h

@@ -185,7 +185,8 @@ public:
     bool synchronousLog(const QString &workingDirectory, const QStringList &arguments,
                         QString *output, QString *errorMessage = nullptr,
                         unsigned flags = 0);
-    bool synchronousAdd(const QString &workingDirectory, const QStringList &files);
+    bool synchronousAdd(const QString &workingDirectory, const QStringList &files,
+                        const QStringList &extraOptions = {});
     bool synchronousDelete(const QString &workingDirectory,
                            bool force,
                            const QStringList &files);

src/plugins/git/gitplugin.cpp

@@ -1872,7 +1872,7 @@ bool GitPluginPrivate::vcsOpen(const QString & /*fileName*/)
 bool GitPluginPrivate::vcsAdd(const QString &fileName)
 {
     const QFileInfo fi(fileName);
-    return m_gitClient.synchronousAdd(fi.absolutePath(), {fi.fileName()});
+    return m_gitClient.synchronousAdd(fi.absolutePath(), {fi.fileName()}, {"--intent-to-add"});
 }
 
 bool GitPluginPrivate::vcsDelete(const QString &fileName)