Merge remote-tracking branch 'origin/4.7' into 4.8

Change-Id: Iaae859601ae4f529c1fa7ada3a5c569820abb0d6
This commit is contained in:
Eike Ziller
2018-09-26 09:38:33 +02:00
8 changed files with 26 additions and 14 deletions

View File

@@ -749,8 +749,9 @@ void MemcheckTool::heobAction()
TaskHub::requestPopup();
return;
}
if (!QFile::exists(executable)
&& !QFile::exists(Utils::HostOsInfo::withExecutableSuffix(executable))) {
if (!QFile::exists(executable))
executable = Utils::HostOsInfo::withExecutableSuffix(executable);
if (!QFile::exists(executable)) {
const QString msg = tr("Heob: Cannot find %1.").arg(executable);
TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID);
TaskHub::requestPopup();