Fix "qbs help" output on Windows.

Bogus tools were being displayed because we did not restrict the file
name pattern enough.

Task-number: QBS-216
Change-Id: I2977f9bba80fdd1b2f74acd17cc2c5bf731ffeb5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/src/app/qbs/qbstool.cpp b/src/app/qbs/qbstool.cpp
index 3ed7e4950..ff30b3372 100644
--- a/src/app/qbs/qbstool.cpp
+++ b/src/app/qbs/qbstool.cpp
@@ -28,6 +28,8 @@
 ****************************************************************************/
 #include "qbstool.h"
 
+#include <tools/hostosinfo.h>
+
 #include <QCoreApplication>
 #include <QDir>
 #include <QProcess>
@@ -39,7 +41,8 @@ static QString qbsBinDir() { return QCoreApplication::applicationDirPath(); }
 
 static QString qbsToolFilePath(const QString &toolName)
 {
-    return qbsBinDir() + QLatin1Char('/') + toolPrefix() + toolName;
+    return qbsBinDir() + QLatin1Char('/') + toolPrefix()
+            + qbs::Internal::HostOsInfo::appendExecutableSuffix(toolName);
 }
 
 void QbsTool::runTool(const QString &toolName, const QStringList &arguments)
@@ -71,11 +74,14 @@ bool QbsTool::tryToRunTool(const QString &toolName, const QStringList &arguments
 
 QStringList QbsTool::allToolNames()
 {
+    const QString suffix = QLatin1String(QTC_HOST_EXE_SUFFIX);
     QStringList toolFileNames = QDir(qbsBinDir()).entryList(QStringList(toolPrefix()
-            + QLatin1Char('*')), QDir::Files, QDir::Name);
+            + QString::fromLocal8Bit("*%1").arg(suffix)), QDir::Files, QDir::Name);
     QStringList toolNames;
     const int prefixLength = toolPrefix().count();
-    foreach (const QString &toolFileName, toolFileNames)
-        toolNames << toolFileName.mid(prefixLength);
+    foreach (const QString &toolFileName, toolFileNames) {
+        toolNames << toolFileName.mid(prefixLength,
+                                      toolFileName.count() - prefixLength - suffix.count());
+    }
     return toolNames;
 }