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

Utils: Add overloads for CommandLine with osType

Browse Source 
In the next commit we want to test these functions,
so we need to make sure that we can specify their
osType. We will also need these functions when we
are combining command lines from different platforms
e.g. on docker where the host might be windows,
but the docker image is Linux (or vice versa).

Task-number: QTCREATORBUG-32325
Change-Id: I7d01bdc5f292b6bf6b76d03856f6d4e588e371ab
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2025-01-16 10:48:17 +01:00
parent d915f1b413
commit 3d7cbe122c
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libs/utils/commandline.cpp
View File

@@ -628,6 +628,12 @@ void ProcessArgs::addArgs(QString *args, const QStringList &inArgs)
addArg(args, arg);
}
void ProcessArgs::addArgs(QString *args, const QStringList &inArgs, OsType osType)
{
for (const QString &arg : inArgs)
addArg(args, arg, osType);
}
CommandLine &CommandLine::operator<<(const QString &arg)
{
addArg(arg);
@@ -1543,6 +1549,15 @@ void CommandLine::addCommandLineAsSingleArg(const CommandLine &cmd)
addArg(combined);
}
void CommandLine::addCommandLineAsSingleArg(const CommandLine &cmd, OsType osType)
{
QString combined;
ProcessArgs::addArg(&combined, cmd.executable().path(), osType);
ProcessArgs::addArgs(&combined, cmd.arguments());
addArg(combined, osType);
}
void CommandLine::addCommandLineWithAnd(const CommandLine &cmd)
{
if (m_executable.isEmpty()) {

3
src/libs/utils/commandline.h
View File

@@ -53,6 +53,8 @@ public:
const Environment *env = nullptr, const FilePath *pwd = nullptr);
//! Quote and append each argument to a shell command
static void addArgs(QString *args, const QStringList &inArgs);
//! Quote and append each argument to a shell command
static void addArgs(QString *args, const QStringList &inArgs, OsType osType);
//! Append already quoted arguments to a shell command
static void addArgs(QString *args, const QString &inArgs);
//! Split a shell command into separate arguments.
@@ -170,6 +172,7 @@ public:
void addCommandLineAsArgs(const CommandLine &cmd, RawType);
void addCommandLineAsSingleArg(const CommandLine &cmd);
void addCommandLineAsSingleArg(const CommandLine &cmd, OsType osType);
void addCommandLineWithAnd(const CommandLine &cmd);
QString toUserOutput() const;