From 2aaa0a2180e7515423934351a9b1c2873987982d Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Mon, 16 Aug 2021 09:22:54 +0200
Subject: [PATCH] Android: Simplify clangPlusPlusPath in toolchain

Change-Id: I195cc3657813a681a625567116c91fd1bdc463cc
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/android/androidtoolchain.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 5a7d68fe6f1..ff92e8c74a3 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -173,9 +173,7 @@ AndroidToolChainFactory::AndroidToolChainFactory()
 
 static FilePath clangPlusPlusPath(const FilePath &clangPath)
 {
-    return clangPath.parentDir().pathAppended(
-                HostOsInfo::withExecutableSuffix(
-                    QFileInfo(clangPath.toString()).baseName() + "++"));
+    return clangPath.parentDir().pathAppended(clangPath.baseName() + "++").withExecutableSuffix();
 }
 
 static QList<FilePath> uniqueNdksForCurrentQtVersions()