diff options
author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-20 13:44:33 +0100 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-11-20 13:01:46 +0000 |
commit | 57239aaf22d388d402b34342bc3309e6418f0137 (patch) | |
tree | 9cf7e270f6471bfa43653fcc8af8d3a37236a039 /src/tools | |
parent | 95ba85c86e0b5d9ef795b5affc54a0877aff2abf (diff) |
C++: Fix build with BUILD_CPLUSPLUS_TOOLS
Change-Id: If55b14f82752e19f536429ee44688156cd0a84da
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp | 4 | ||||
-rw-r--r-- | src/tools/cplusplus-shared/tool.pri | 2 | ||||
-rw-r--r-- | src/tools/cplusplus-shared/utils.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp index 86a2a34e39..29a2111880 100644 --- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp +++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp @@ -38,6 +38,8 @@ #include <cplusplus/Symbols.h> #include <cplusplus/TranslationUnit.h> +#include <utils/hostosinfo.h> + #include "utils.h" #include <QDir> @@ -361,7 +363,7 @@ private: static void createImageFromDot(const QString &inputFile, const QString &outputFile, bool verbose) { - const QString command = CplusplusToolsUtils::portableExecutableName(QLatin1String("dot")); + const QString command = Utils::HostOsInfo::withExecutableSuffix("dot"); const QStringList arguments = QStringList({"-Tpng", "-o", outputFile, inputFile}); CplusplusToolsUtils::executeCommand(command, arguments, QString(), verbose); } diff --git a/src/tools/cplusplus-shared/tool.pri b/src/tools/cplusplus-shared/tool.pri index dbd31739a3..9de5dcbefd 100644 --- a/src/tools/cplusplus-shared/tool.pri +++ b/src/tools/cplusplus-shared/tool.pri @@ -1,4 +1,4 @@ -QTC_LIB_DEPENDS += cplusplus +QTC_LIB_DEPENDS += cplusplus utils include(../../../qtcreator.pri) diff --git a/src/tools/cplusplus-shared/utils.h b/src/tools/cplusplus-shared/utils.h index 48131cf5c6..c8f93310c4 100644 --- a/src/tools/cplusplus-shared/utils.h +++ b/src/tools/cplusplus-shared/utils.h @@ -31,7 +31,6 @@ namespace CplusplusToolsUtils { -QString portableExecutableName(const QString &executable); void executeCommand(const QString &command, const QStringList &arguments, const QString &outputFile, bool verbose = false); |