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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
This commit is contained in:
Eike Ziller
2011-07-15 14:29:07 +02:00
parent ab8713d792 dbc0fa0919
commit e5ca4b3462
271 changed files with 6421 additions and 9989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/valgrind/memcheckengine.cpp
View File

@@ -34,7 +34,7 @@
#include "memcheckengine.h"
#include "memchecksettings.h"
#include "valgrindsettings.h"
#include <analyzerbase/analyzersettings.h>
@@ -96,7 +96,7 @@ QStringList MemcheckEngine::toolArguments() const
QStringList arguments;
arguments << QLatin1String("--gen-suppressions=all");
AbstractMemcheckSettings *memcheckSettings = m_settings->subConfig<AbstractMemcheckSettings>();
ValgrindBaseSettings *memcheckSettings = m_settings->subConfig<ValgrindBaseSettings>();
QTC_ASSERT(memcheckSettings, return arguments);
if (memcheckSettings->trackOrigins())
@@ -111,7 +111,7 @@ QStringList MemcheckEngine::toolArguments() const
QStringList MemcheckEngine::suppressionFiles() const
{
return m_settings->subConfig<AbstractMemcheckSettings>()->suppressionFiles();
return m_settings->subConfig<ValgrindBaseSettings>()->suppressionFiles();
}
void MemcheckEngine::status(const Status &status)