feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.7'

Browse Source 
Conflicts:
	src/plugins/clangtools/clangtoolruncontrol.cpp
	src/plugins/cpptools/compileroptionsbuilder.cpp

Change-Id: Ib1e8abf066898b50c90fc1ccba4697fe983e8a8f
This commit is contained in:
Eike Ziller
2018-08-15 13:53:28 +02:00
parent 7bc14bf349 58747b2de1
commit db9837fa6c
542 changed files with 83219 additions and 67095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/valgrind/memchecktool.cpp
View File

@@ -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();