feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.10'

Browse Source 
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
This commit is contained in:
Eike Ziller
2019-06-18 12:30:00 +02:00
parent d504277901 b02f4ae615
commit 917636b88b
136 changed files with 1068 additions and 1067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/fileutils.h
View File

@@ -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 {