diff options
author | Eike Ziller <eike.ziller@qt.io> | 2019-06-18 12:30:00 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2019-06-18 12:30:55 +0200 |
commit | 917636b88b2b8b4a7e3d945671b978504df5bc3f (patch) | |
tree | e0e13633c5e281ddd6c6a6bd67c190a0331532b0 /src/libs/utils/fileutils.h | |
parent | d504277901279d8b01efe1da8b21fc0ec9290c9c (diff) | |
parent | b02f4ae6154810a9894615eca3052957e6e3ec56 (diff) | |
download | qt-creator-917636b88b2b8b4a7e3d945671b978504df5bc3f.tar.gz |
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
Diffstat (limited to 'src/libs/utils/fileutils.h')
-rw-r--r-- | src/libs/utils/fileutils.h | 7 |
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 { |