Merge remote-tracking branch 'origin/4.0'

Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/autotest/testconfiguration.cpp b/src/plugins/autotest/testconfiguration.cpp
index 543d3b8c034..b69abc4b8e0 100644
--- a/src/plugins/autotest/testconfiguration.cpp
+++ b/src/plugins/autotest/testconfiguration.cpp
@@ -115,7 +115,11 @@ void TestConfiguration::completeTestInformation()
         foreach (const BuildTargetInfo &bti, appTargets.list) {
             // some project manager store line/column information as well inside ProjectPart
             if (bti.isValid() && m_proFile.startsWith(bti.projectFilePath.toString())) {
-                targetFile = Utils::HostOsInfo::withExecutableSuffix(bti.targetFilePath.toString());
+                targetFile = bti.targetFilePath.toString();
+                if (Utils::HostOsInfo::isWindowsHost()
+                        && !targetFile.toLower().endsWith(QLatin1String(".exe"))) {
+                    targetFile = Utils::HostOsInfo::withExecutableSuffix(targetFile);
+                }
                 targetName = bti.targetName;
                 break;
             }