diff options
| author | Katja Marttila <katja.marttila@theqtcompany.com> | 2016-05-24 13:22:00 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2016-06-13 11:15:21 +0000 |
| commit | 9b6b59cfc19dc61dd642706a24e1c5d3b6b39609 (patch) | |
| tree | 030d58f1c4043f4fc3cdfe34c25851458df1c845 /src | |
| parent | 62c34c7e5554b3dc32c3fa3be6dcb930629eb5a4 (diff) | |
Make Execute operation work without arguments in Windows
Since Qt5.5, QProcess start() needs a program to start.
When using native arguments the program is empty and QProcess will
fail to start. Removed the use of native arguments until
QProcess supports setting program through native arguments.
Task-number: QTIFW-862
Change-Id: Ia56344e1bf82fbd76e4e8f2ae8b6817e4bb2fce1
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/elevatedexecuteoperation.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp index 5de3c0203..cb1a8372c 100644 --- a/src/libs/installer/elevatedexecuteoperation.cpp +++ b/src/libs/installer/elevatedexecuteoperation.cpp @@ -172,16 +172,7 @@ bool ElevatedExecuteOperation::Private::run(const QStringList &arguments) } //readProcessOutput should only called from this current Thread -> Qt::DirectConnection QObject::connect(process, SIGNAL(readyRead()), q, SLOT(readProcessOutput()), Qt::DirectConnection); -#ifdef Q_OS_WIN - if (args.count() == 1) { - process->setNativeArguments(args.front()); - qDebug() << "ElevatedExecuteOperation setNativeArguments to start:" << args.front(); - process->start(QString(), QStringList()); - } else -#endif - { - process->start(args.front(), args.mid(1)); - } + process->start(args.front(), args.mid(1)); qDebug() << args.front() << "started, arguments:" << QStringList(args.mid(1)).join(QLatin1String(" ")); bool success = false; |