diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2019-11-14 16:07:55 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-11-14 15:17:34 +0000 |
| commit | 9c43466485bcc546f0daeea5277286b29efc781e (patch) | |
| tree | 5aff163c9a8b5f486bd5d5ff7ab31fb4941c765d /src/tools | |
| parent | b7395e97f3586fc14f94d2868148e992508b2d76 (diff) | |
Use HostOsInfo::withExecutableSuffix instead of if/else
Let's use our Utils.
Change-Id: I8cfbce55d2b41e42e86d050433df2cfd20cebe1b
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/cplusplus-shared/utils.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/tools/cplusplus-shared/utils.cpp b/src/tools/cplusplus-shared/utils.cpp index 1373d5f6f9..a4111b6dd9 100644 --- a/src/tools/cplusplus-shared/utils.cpp +++ b/src/tools/cplusplus-shared/utils.cpp @@ -34,15 +34,6 @@ namespace CplusplusToolsUtils { -QString portableExecutableName(const QString &executable) -{ -#if defined(Q_OS_WIN) - return executable + QLatin1String(".exe"); -#else - return executable; -#endif -} - void executeCommand(const QString &command, const QStringList &arguments, const QString &outputFile, bool verbose) { @@ -86,9 +77,9 @@ void executeCommand(const QString &command, const QStringList &arguments, const SystemPreprocessor::SystemPreprocessor(bool verbose) : m_verbose(verbose) { - m_knownCompilers[portableExecutableName(QLatin1String("gcc"))] + m_knownCompilers[Utils::HostOsInfo::withExecutableSuffix("gcc")] = QLatin1String("-DCPLUSPLUS_WITHOUT_QT -U__BLOCKS__ -xc++ -E -include"); - m_knownCompilers[portableExecutableName(QLatin1String("cl"))] + m_knownCompilers[Utils::HostOsInfo::withExecutableSuffix("cl")] = QLatin1String("/DCPLUSPLUS_WITHOUT_QT /U__BLOCKS__ /TP /E /I . /FI"); QMapIterator<QString, QString> i(m_knownCompilers); |