diff options
| author | hjk <hjk@qt.io> | 2019-06-06 16:27:55 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-06-11 08:11:07 +0000 |
| commit | ca4ba34229c247027074c25abf51bf02ff15af96 (patch) | |
| tree | f5f93acda470948ec0f07b1dbfe5a58333bcb8bb /src/libs/extensionsystem | |
| parent | 021d3a6c59264e4aac0284628b8d2daadbad4ed7 (diff) | |
| download | qt-creator-ca4ba34229c247027074c25abf51bf02ff15af96.tar.gz | |
Use Utils::FilePath in SynchronousProcess
Adapt callers and surrounding code.
Change-Id: Ie6c1883a44169cf9d790d06b660f46d24dc24c89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/libs/extensionsystem')
| -rw-r--r-- | src/libs/extensionsystem/pluginmanager.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 6fbda8e4ec..9ef7d8cdc7 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -49,6 +49,7 @@ #include <utils/algorithm.h> #include <utils/benchmarker.h> #include <utils/executeondestruction.h> +#include <utils/fileutils.h> #include <utils/hostosinfo.h> #include <utils/mimetypes/mimedatabase.h> #include <utils/qtcassert.h> @@ -413,10 +414,10 @@ static QString filled(const QString &s, int min) QString PluginManager::systemInformation() const { QString result; - const QString qtdiagBinary = HostOsInfo::withExecutableSuffix( - QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qtdiag"); + CommandLine qtDiag(FilePath::fromString(HostOsInfo::withExecutableSuffix( + QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qtdiag"))); SynchronousProcess qtdiagProc; - const SynchronousProcessResponse response = qtdiagProc.runBlocking(qtdiagBinary, QStringList()); + const SynchronousProcessResponse response = qtdiagProc.runBlocking(qtDiag); if (response.result == SynchronousProcessResponse::Finished) result += response.allOutput() + "\n"; result += "Plugin information:\n\n"; |