Merge remote-tracking branch 'origin/4.10'

Conflicts:
        src/libs/utils/consoleprocess.h
        src/libs/utils/consoleprocess_unix.cpp
        src/libs/utils/consoleprocess_win.cpp
        src/plugins/projectexplorer/devicesupport/sshdeviceprocess.cpp
        src/tools/clangrefactoringbackend/source/symbolscollector.cpp
        tests/unit/mockup/projectexplorer/project.h

Change-Id: I8d10f26b9bcb54829ba31cdc2272885691df1e16

1 files changed, 6 insertions, 1 deletions

diff --git a/src/libs/utils/fileutils.h b/src/libs/utils/fileutils.h
index 15f119646e..cfe388bb47 100644
--- a/src/libs/utils/fileutils.h
+++ b/src/libs/utils/fileutils.h
@@ -132,10 +132,13 @@ class QTCREATOR_UTILS_EXPORT CommandLine
 {
 public:
     enum RawType { Raw };
+    enum class MetaCharMode { Abort, Ignore };
 
     CommandLine() {}
     explicit CommandLine(const FilePath &executable);
-    CommandLine(const FilePath &exe, const QStringList &args);
+    CommandLine(const FilePath &exe,
+                const QStringList &args,
+                MetaCharMode metaCharMode = MetaCharMode::Ignore);
     CommandLine(const FilePath &exe, const QString &unparsedArgs, RawType);
 
     void addArg(const QString &arg, OsType osType = HostOsInfo::hostOs());
@@ -147,11 +150,13 @@ public:
 
     FilePath executable() const { return m_executable; }
     QString arguments() const { return m_arguments; }
+    MetaCharMode metaCharMode() const { return m_metaCharMode; }
     QStringList splitArguments(OsType osType = HostOsInfo::hostOs()) const;
 
 private:
     FilePath m_executable;
     QString m_arguments;
+    MetaCharMode m_metaCharMode;
 };
 
 class QTCREATOR_UTILS_EXPORT FileUtils {