From 57239aaf22d388d402b34342bc3309e6418f0137 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Wed, 20 Nov 2019 13:44:33 +0100
Subject: [PATCH] C++: Fix build with BUILD_CPLUSPLUS_TOOLS

Change-Id: If55b14f82752e19f536429ee44688156cd0a84da
Reviewed-by: hjk <hjk@qt.io>
---
 src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp | 4 +++-
 src/tools/cplusplus-shared/tool.pri               | 2 +-
 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 86a2a34e39b..29a2111880a 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 dbd31739a33..9de5dcbefd2 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 48131cf5c6a..c8f93310c41 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);