diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-08-15 13:53:28 +0200 |
| commit | db9837fa6c9401e898ac8e7492081a6e21c71790 (patch) | |
| tree | d542a089711257402ac4fe70813fa0e7de825f2e /src/plugins/valgrind/memchecktool.cpp | |
| parent | 7bc14bf3498ea6b1c19abacf85a5103772da26bc (diff) | |
| parent | 58747b2de107e8f6ac00daeb431ecbf3e603fd34 (diff) | |
| download | qt-creator-db9837fa6c9401e898ac8e7492081a6e21c71790.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/clangtools/clangtoolruncontrol.cpp
src/plugins/cpptools/compileroptionsbuilder.cpp
Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
Diffstat (limited to 'src/plugins/valgrind/memchecktool.cpp')
| -rw-r--r-- | src/plugins/valgrind/memchecktool.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 4eb2b4c734..534de63d3d 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -753,7 +753,8 @@ void MemcheckTool::heobAction() TaskHub::requestPopup(); return; } - if (!QFile::exists(executable)) { + if (!QFile::exists(executable) + && !QFile::exists(Utils::HostOsInfo::withExecutableSuffix(executable))) { const QString msg = tr("Heob: Cannot find %1.").arg(executable); TaskHub::addTask(Task::Error, msg, Debugger::Constants::ANALYZERTASK_ID); TaskHub::requestPopup(); |