Merge "Merge remote-tracking branch 'origin/9.0'"

doc/qtcreator/src/cmake/creator-projects-cmake-building.qdoc

@@ -155,6 +155,9 @@
     (\uicontrol {Zoom In}) or \inlineimage icons/minus.png
     (\uicontrol {Zoom Out}), or press \key Ctrl++ or \key Ctrl+-.
 
+    To hide the output, select the \inlineimage icons/rightsidebaricon.png
+    (\uicontrol {Hide/Show Right Sidebar}) button or press \key {Alt+Shift+0}.
+
     \section1 CMake Build Steps
 
     \QC builds CMake projects by running \c {cmake . --build}, which then runs

doc/qtcreator/src/editors/creator-coding-edit-mode.qdoc

@@ -284,6 +284,12 @@
     supported for namespaces, classes, functions, variables, include statements,
     and macros.
 
+    To move to the type definition of a symbol, select
+    \uicontrol {Follow Symbol Under Cursor to Type} or press
+    \key {Ctrl+Shift+F2}. To follow the symbol in the next split, select
+    \uicontrol {Follow Symbol Under Cursor to Type in Next Split} or
+    press \key {Ctrl+E, Ctrl+Shift+F2}.
+
     When the cursor is on a string literal and the string is a QRC file path,
     following the symbol opens the specified resource file for editing in the
     \uicontrol {Resource Browser}.

share/qtcreator/templates/wizards/projects/git.ignore

@@ -37,6 +37,7 @@ Thumbs.db
 
 # qtcreator generated files
 *.pro.user*
+CMakeLists.txt.user*
 
 # xemacs temporary files
 *.flc

src/libs/utils/filepath.cpp

@@ -629,7 +629,7 @@ FilePathInfo FilePath::filePathInfo() const
     QFileInfo fi(path());
     result.fileSize = fi.size();
     result.lastModified = fi.lastModified();
-    result.fileFlags = (FilePathInfo::FileFlag) fi.permissions().toInt();
+    result.fileFlags = (FilePathInfo::FileFlag) int(fi.permissions());
 
     if (fi.isDir())
         result.fileFlags |= FilePathInfo::DirectoryType;

src/plugins/coreplugin/locator/executefilter.cpp

@@ -4,6 +4,7 @@
 #include "executefilter.h"
 
 #include <coreplugin/icore.h>
+#include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/messagemanager.h>
 #include <utils/algorithm.h>
 #include <utils/environment.h>
@@ -114,6 +115,7 @@ void ExecuteFilter::done()
 {
     QTC_ASSERT(m_process, return);
     MessageManager::writeFlashing(m_process->exitMessage());
+    EditorManager::updateWindowTitles(); // Refresh VCS topic if needed
 
     removeProcess();
     runHeadCommand();

src/plugins/git/gitclient.cpp

@@ -916,11 +916,12 @@ FilePaths GitClient::unmanagedFiles(const FilePaths &filePaths) const
         const CommandResult result = vcsSynchronousExec(it.key(), args, RunFlags::NoOutput);
         if (result.result() != ProcessResult::FinishedWithSuccess)
             return filePaths;
-        const QStringList managedFilePaths
+        const auto toAbs = [&wd](const QString &fp) { return wd.absoluteFilePath(fp); };
-            = transform(result.cleanedStdOut().split('\0', Qt::SkipEmptyParts),
+        const QStringList managedFilePaths =
-                            [&wd](const QString &fp) { return wd.absoluteFilePath(fp); });
+                Utils::transform(result.cleanedStdOut().split('\0', Qt::SkipEmptyParts), toAbs);
-        const QStringList filtered = Utils::filtered(it.value(), [&managedFilePaths, &wd](const QString &fp) {
+        const QStringList absPaths = Utils::transform(it.value(), toAbs);
-            return !managedFilePaths.contains(wd.absoluteFilePath(fp));
+        const QStringList filtered = Utils::filtered(absPaths, [&managedFilePaths](const QString &fp) {
+            return !managedFilePaths.contains(fp);
         });
         res += FileUtils::toFilePathList(filtered);
     }
@@ -1530,7 +1531,9 @@ bool GitClient::synchronousAdd(const FilePath &workingDirectory,
                                const QStringList &extraOptions)
 {
     QStringList args{"add"};
-    args += extraOptions + files;
+    args += extraOptions;
+    args += "--";
+    args += files;
     return vcsSynchronousExec(workingDirectory, args).result()
             == ProcessResult::FinishedWithSuccess;
 }
@@ -1542,6 +1545,7 @@ bool GitClient::synchronousDelete(const FilePath &workingDirectory,
     QStringList arguments = {"rm"};
     if (force)
         arguments << "--force";
+    arguments << "--";
     arguments.append(files);
     return vcsSynchronousExec(workingDirectory, arguments).result()
             == ProcessResult::FinishedWithSuccess;

src/plugins/git/gitplugin.cpp

@@ -1834,7 +1834,7 @@ bool GitPluginPrivate::vcsAdd(const FilePath &filePath)
 
 bool GitPluginPrivate::vcsDelete(const FilePath &filePath)
 {
-    return m_gitClient.synchronousDelete(filePath.parentDir().absolutePath(), true, {filePath.fileName()});
+    return m_gitClient.synchronousDelete(filePath.absolutePath(), true, {filePath.fileName()});
 }
 
 bool GitPluginPrivate::vcsMove(const FilePath &from, const FilePath &to)

src/plugins/mesonprojectmanager/mesonprocess.cpp

@@ -60,6 +60,8 @@ void MesonProcess::handleProcessDone()
 void MesonProcess::setupProcess(const Command &command, const Environment &env,
                                 const QString &projectName, bool captureStdo)
 {
+    if (m_process)
+        m_process.release()->deleteLater();
     m_process.reset(new QtcProcess);
     connect(m_process.get(), &QtcProcess::done, this, &MesonProcess::handleProcessDone);
     if (!captureStdo) {

src/plugins/mesonprojectmanager/mesonprojectparser.cpp

@@ -196,19 +196,17 @@ QList<ProjectExplorer::BuildTargetInfo> MesonProjectParser::appsTargets() const
     }
     return apps;
 }
+
 bool MesonProjectParser::startParser()
 {
     m_parserFutureResult = Utils::runAsync(
                 ProjectExplorer::ProjectExplorerPlugin::sharedThreadPool(),
-        [process = &m_process,
+                [processOutput = m_process.stdOut(), introType = m_introType,
-         introType = m_introType,
+                buildDir = m_buildDir.toString(), srcDir = m_srcDir] {
-         buildDir = m_buildDir.toString(),
+        if (introType == IntroDataType::file)
-         srcDir = m_srcDir]() {
-            if (introType == IntroDataType::file) {
             return extractParserResults(srcDir, MesonInfoParser::parse(buildDir));
-            } else {
+        else
-                return extractParserResults(srcDir, MesonInfoParser::parse(process->stdOut()));
+            return extractParserResults(srcDir, MesonInfoParser::parse(processOutput));
-            }
     });
 
     Utils::onFinished(m_parserFutureResult, this, &MesonProjectParser::update);

src/plugins/squish/suiteconf.cpp

@@ -291,9 +291,7 @@ bool SuiteConf::ensureObjectMapExists() const
 {
     if (m_objectMapStyle != "script") {
         const Utils::FilePath objectMap = objectMapPath();
-        bool ok = objectMap.parentDir().ensureWritableDir();
+        return objectMap.parentDir().ensureWritableDir() && objectMap.ensureExistingFile();
-        ok |= objectMap.ensureExistingFile();
-        return ok;
     }
 
     const Utils::FilePath scripts = SquishPlugin::squishSettings()->scriptsPath(language());