From 3ca4b74618a04cf6c01d0d29927f62223f201d61 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 30 Jun 2011 19:05:57 +0200 Subject: make argument quoting code on windows less arcane Change-Id: I6eca1d336ff770d3e5548e58137ca0053d4f63db Reviewed-on: http://codereview.qt.nokia.com/963 Reviewed-by: Qt Sanity Bot Reviewed-by: Joerg Bornemann --- src/corelib/io/qprocess_win.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index dba3de47a7..510f72312e 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -263,16 +263,13 @@ static QString qt_create_commandline(const QString &program, const QStringList & // The argument must not end with a \ since this would be interpreted // as escaping the quote -- rather put the \ behind the quote: e.g. // rather use "foo"\ than "foo\" - QString endQuote(QLatin1Char('\"')); int i = tmp.length(); - while (i>0 && tmp.at(i-1) == QLatin1Char('\\')) { + while (i > 0 && tmp.at(i - 1) == QLatin1Char('\\')) --i; - endQuote += QLatin1Char('\\'); - } - args += QLatin1String(" \"") + tmp.left(i) + endQuote; - } else { - args += QLatin1Char(' ') + tmp; + tmp.insert(i, QLatin1Char('"')); + tmp.prepend(QLatin1Char('"')); } + args += QLatin1Char(' ') + tmp; } return args; } -- cgit v1.2.3