59 files changed, 1390 insertions, 19 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index d9653e88a1..e79e175729 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -14,7 +14,8 @@ SUBDIRS += \
     qtcprocess \
     utils \
     utils_stringutils \
-    filesearch
+    filesearch \
+    valgrind
 
 #contains (QT_CONFIG, declarative) {
 #SUBDIRS += qml
diff --git a/tests/valgrind/README b/tests/auto/valgrind/README
index db43debdae..daac03a3d5 100644
--- a/tests/valgrind/README
+++ b/tests/auto/valgrind/README
@@ -11,5 +11,5 @@ cd valgrind-test
 export LD_LIBRARY_PATH=/path/to/qtc-build/lib/qtcreator:/path/to/qtc-build/lib/qtcreator/plugins/QtProject
 
 # run qmake, make
-qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/valgrind
+qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/auto/valgrind
 make
diff --git a/tests/valgrind/callgrind/callgrind.pro b/tests/auto/valgrind/callgrind/callgrind.pro
index c48d1f43a5..c48d1f43a5 100644
--- a/tests/valgrind/callgrind/callgrind.pro
+++ b/tests/auto/valgrind/callgrind/callgrind.pro
diff --git a/tests/valgrind/callgrind/callgrindparsertests.cpp b/tests/auto/valgrind/callgrind/callgrindparsertests.cpp
index da909fc3b1..da909fc3b1 100644
--- a/tests/valgrind/callgrind/callgrindparsertests.cpp
+++ b/tests/auto/valgrind/callgrind/callgrindparsertests.cpp
diff --git a/tests/valgrind/callgrind/callgrindparsertests.h b/tests/auto/valgrind/callgrind/callgrindparsertests.h
index f543c0946d..f543c0946d 100644
--- a/tests/valgrind/callgrind/callgrindparsertests.h
+++ b/tests/auto/valgrind/callgrind/callgrindparsertests.h
diff --git a/tests/valgrind/callgrind/callgrindparsertests.pro b/tests/auto/valgrind/callgrind/callgrindparsertests.pro
index 99ccfb9bd0..3b77e9ac82 100644
--- a/tests/valgrind/callgrind/callgrindparsertests.pro
+++ b/tests/auto/valgrind/callgrind/callgrindparsertests.pro
@@ -1,10 +1,10 @@
-include(../../auto/qttest.pri)
+include(../../qttest.pri)
 include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
-TARGET = callgrindparsertests
+TARGET = tst_callgrindparsertests
 
-DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
+DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$_PRO_FILE_PWD_/data\\\""
 #enable extra debugging code
 DEFINES += "CALLGRINDPARSERTESTS"
 
diff --git a/tests/valgrind/callgrind/data/calleeFunctions.out b/tests/auto/valgrind/callgrind/data/calleeFunctions.out
index 5f650b29c1..5f650b29c1 100644
--- a/tests/valgrind/callgrind/data/calleeFunctions.out
+++ b/tests/auto/valgrind/callgrind/data/calleeFunctions.out
diff --git a/tests/valgrind/callgrind/data/callgrind.out.sample b/tests/auto/valgrind/callgrind/data/callgrind.out.sample
index ce6e8f5769..ce6e8f5769 100644
--- a/tests/valgrind/callgrind/data/callgrind.out.sample
+++ b/tests/auto/valgrind/callgrind/data/callgrind.out.sample
diff --git a/tests/valgrind/callgrind/data/callgrind.out.sample.annotated b/tests/auto/valgrind/callgrind/data/callgrind.out.sample.annotated
index 3ea610f5d8..3ea610f5d8 100644
--- a/tests/valgrind/callgrind/data/callgrind.out.sample.annotated
+++ b/tests/auto/valgrind/callgrind/data/callgrind.out.sample.annotated
diff --git a/tests/valgrind/callgrind/data/callgrind.out.sample.expected b/tests/auto/valgrind/callgrind/data/callgrind.out.sample.expected
index 5be5600678..5be5600678 100644
--- a/tests/valgrind/callgrind/data/callgrind.out.sample.expected
+++ b/tests/auto/valgrind/callgrind/data/callgrind.out.sample.expected
diff --git a/tests/valgrind/callgrind/data/cycle.out b/tests/auto/valgrind/callgrind/data/cycle.out
index 4711037158..4711037158 100644
--- a/tests/valgrind/callgrind/data/cycle.out
+++ b/tests/auto/valgrind/callgrind/data/cycle.out
diff --git a/tests/valgrind/callgrind/data/inlinedFunctions.out b/tests/auto/valgrind/callgrind/data/inlinedFunctions.out
index b9f1135048..b9f1135048 100644
--- a/tests/valgrind/callgrind/data/inlinedFunctions.out
+++ b/tests/auto/valgrind/callgrind/data/inlinedFunctions.out
diff --git a/tests/valgrind/callgrind/data/multiCost.out b/tests/auto/valgrind/callgrind/data/multiCost.out
index 8fee827d5d..8fee827d5d 100644
--- a/tests/valgrind/callgrind/data/multiCost.out
+++ b/tests/auto/valgrind/callgrind/data/multiCost.out
diff --git a/tests/valgrind/callgrind/data/multiCostAndPos.out b/tests/auto/valgrind/callgrind/data/multiCostAndPos.out
index 3959c1c864..3959c1c864 100644
--- a/tests/valgrind/callgrind/data/multiCostAndPos.out
+++ b/tests/auto/valgrind/callgrind/data/multiCostAndPos.out
diff --git a/tests/valgrind/callgrind/data/multiPos.out b/tests/auto/valgrind/callgrind/data/multiPos.out
index 00ffdd9d5e..00ffdd9d5e 100644
--- a/tests/valgrind/callgrind/data/multiPos.out
+++ b/tests/auto/valgrind/callgrind/data/multiPos.out
diff --git a/tests/valgrind/callgrind/data/recursion.out b/tests/auto/valgrind/callgrind/data/recursion.out
index 2c86bfefdc..2c86bfefdc 100644
--- a/tests/valgrind/callgrind/data/recursion.out
+++ b/tests/auto/valgrind/callgrind/data/recursion.out
diff --git a/tests/valgrind/callgrind/data/recursiveCycle.out b/tests/auto/valgrind/callgrind/data/recursiveCycle.out
index 7c5110433a..7c5110433a 100644
--- a/tests/valgrind/callgrind/data/recursiveCycle.out
+++ b/tests/auto/valgrind/callgrind/data/recursiveCycle.out
diff --git a/tests/valgrind/callgrind/data/simpleFunction.out b/tests/auto/valgrind/callgrind/data/simpleFunction.out
index feeba5d1a6..feeba5d1a6 100644
--- a/tests/valgrind/callgrind/data/simpleFunction.out
+++ b/tests/auto/valgrind/callgrind/data/simpleFunction.out
diff --git a/tests/valgrind/callgrind/modeltest.cpp b/tests/auto/valgrind/callgrind/modeltest.cpp
index 32dee035b0..f47b4c22e6 100644
--- a/tests/valgrind/callgrind/modeltest.cpp
+++ b/tests/auto/valgrind/callgrind/modeltest.cpp
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
     calleeDock->setWidget(handler->calleesView());
     window.addDockWidget(Qt::RightDockWidgetArea, calleeDock);
 
-    QDockWidget *widgetDock = new QDockWidget("visualisation", &window);
+    QDockWidget *widgetDock = new QDockWidget("vizualisation", &window);
     widgetDock->setWidget(handler->visualisation());
     window.addDockWidget(Qt::BottomDockWidgetArea, widgetDock);
 
diff --git a/tests/valgrind/callgrind/modeltest.h b/tests/auto/valgrind/callgrind/modeltest.h
index 7ffca8a91c..7ffca8a91c 100644
--- a/tests/valgrind/callgrind/modeltest.h
+++ b/tests/auto/valgrind/callgrind/modeltest.h
diff --git a/tests/valgrind/callgrind/modeltest.pro b/tests/auto/valgrind/callgrind/modeltest.pro
index 9ad6548669..9ad6548669 100644
--- a/tests/valgrind/callgrind/modeltest.pro
+++ b/tests/auto/valgrind/callgrind/modeltest.pro
diff --git a/tests/auto/valgrind/memcheck/data/memcheck-output-sample1.xml b/tests/auto/valgrind/memcheck/data/memcheck-output-sample1.xml
new file mode 100644
index 0000000000..e4278497c9
--- /dev/null
+++ b/tests/auto/valgrind/memcheck/data/memcheck-output-sample1.xml
@@ -0,0 +1,370 @@
+<?xml version="1.0"?>
+
+<valgrindoutput>
+
+<protocolversion>4</protocolversion>
+<protocoltool>memcheck</protocoltool>
+
+<preamble>
+  <line>Memcheck, a memory error detector</line>
+  <line>Copyright (C) 2002-2009, and GNU GPL'd, by Julian Seward et al.</line>
+  <line>Using Valgrind-3.6.0.SVN-Debian and LibVEX; rerun with -h for copyright info</line>
+  <line>Command: kate</line>
+</preamble>
+
+<pid>22733</pid>
+<ppid>17584</ppid>
+<tool>memcheck</tool>
+
+<args>
+  <vargv>
+    <exe>/usr/bin/valgrind.bin</exe>
+    <arg>--suppressions=/usr/lib/valgrind/debian-libc6-dbg.supp</arg>
+    <arg>--xml=yes</arg>
+    <arg>--xml-file=test.xml</arg>
+    <arg>--track-origins=yes</arg>
+  </vargv>
+  <argv>
+    <exe>kate</exe>
+  </argv>
+</args>
+
+<status>
+  <state>RUNNING</state>
+  <time>00:00:00:00.241 </time>
+</status>
+
+<error>
+  <unique>0x9</unique>
+  <tid>1</tid>
+  <kind>InvalidRead</kind>
+  <what>Invalid read of size 4</what>
+  <stack>
+    <frame>
+      <ip>0x6E47964</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QFrame::frameStyle() const</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/widgets</dir>
+      <file>qframe.cpp</file>
+      <line>252</line>
+    </frame>
+    <frame>
+      <ip>0x118F2AF7</ip>
+      <obj>/usr/lib/kde4/plugins/styles/oxygen.so</obj>
+    </frame>
+    <frame>
+      <ip>0x6A81671</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QWidget::event(QEvent*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qwidget.cpp</file>
+      <line>8273</line>
+    </frame>
+    <frame>
+      <ip>0x6A2B6EB</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QApplicationPrivate::notify_helper(QObject*, QEvent*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qapplication.cpp</file>
+      <line>4396</line>
+    </frame>
+    <!--
+    <frame>
+      <ip>0x6A311DC</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QApplication::notify(QObject*, QEvent*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qapplication.cpp</file>
+      <line>4277</line>
+    </frame>
+    <frame>
+      <ip>0x6443535</ip>
+      <obj>/usr/lib/libkdeui.so.5.5.0</obj>
+      <fn>KApplication::notify(QObject*, QEvent*)</fn>
+    </frame>
+    <frame>
+      <ip>0x83690AB</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QCoreApplication::notifyInternal(QObject*, QEvent*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/kernel</dir>
+      <file>qcoreapplication.cpp</file>
+      <line>732</line>
+    </frame>
+    <frame>
+      <ip>0x6A77600</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QWidget::ensurePolished() const</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/../../include/QtCore/../../src/corelib/kernel</dir>
+      <file>qcoreapplication.h</file>
+      <line>215</line>
+    </frame>
+    <frame>
+      <ip>0x6A869B2</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QWidget::setVisible(bool)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qwidget.cpp</file>
+      <line>7539</line>
+    </frame>
+    <frame>
+      <ip>0x18B1ED35</ip>
+      <obj>/home/milian/projects/compiled/kde4/lib/libkatepartinterfaces.so.4.5.0</obj>
+      <fn>QWidget::show()</fn>
+      <dir>/usr/include/qt4/QtGui</dir>
+      <file>qwidget.h</file>
+      <line>487</line>
+    </frame>
+    <frame>
+      <ip>0x18C23615</ip>
+      <obj>/home/milian/projects/compiled/kde4/lib/libkatepartinterfaces.so.4.5.0</obj>
+      <fn>KateViewInternal::KateViewInternal(KateView*)</fn>
+      <dir>/home/milian/projects/kde4/kate/part/view</dir>
+      <file>kateviewinternal.cpp</file>
+      <line>144</line>
+    </frame>
+    <frame>
+      <ip>0x18C0DA68</ip>
+      <obj>/home/milian/projects/compiled/kde4/lib/libkatepartinterfaces.so.4.5.0</obj>
+      <fn>KateView::KateView(KateDocument*, QWidget*)</fn>
+      <dir>/home/milian/projects/kde4/kate/part/view</dir>
+      <file>kateview.cpp</file>
+      <line>136</line>
+    </frame>
+    -->
+  </stack>
+  <auxwhat>Address 0x11527cb8 is not stack'd, malloc'd or (recently) free'd</auxwhat>
+</error>
+
+
+<status>
+  <state>FINISHED</state>
+  <time>00:00:01:49.732 </time>
+</status>
+
+<error>
+  <unique>0x13</unique>
+  <tid>1</tid>
+  <kind>Leak_PossiblyLost</kind>
+  <xwhat>
+    <text>2 bytes in 1 blocks are possibly lost in loss record 2 of 2,003</text>
+    <leakedbytes>2</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x4C284A8</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so</obj>
+      <fn>malloc</fn>
+      <dir>/build/buildd/valgrind-3.6.0~svn20100212/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>236</line>
+    </frame>
+    <frame>
+      <ip>0xD4D7754</ip>
+      <obj>/lib/libglib-2.0.so.0.2400.1</obj>
+      <fn>g_malloc</fn>
+    </frame>
+    <frame>
+      <ip>0xD4EF11D</ip>
+      <obj>/lib/libglib-2.0.so.0.2400.1</obj>
+      <fn>g_strdup</fn>
+    </frame>
+    <frame>
+      <ip>0xD503DC4</ip>
+      <obj>/lib/libglib-2.0.so.0.2400.1</obj>
+      <fn>g_get_language_names</fn>
+    </frame>
+    <frame>
+      <ip>0xD4F89A9</ip>
+      <obj>/lib/libglib-2.0.so.0.2400.1</obj>
+      <fn>g_thread_init_glib</fn>
+    </frame>
+    <frame>
+      <ip>0x8396569</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(_GMainContext*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/kernel</dir>
+      <file>qeventdispatcher_glib.cpp</file>
+      <line>299</line>
+    </frame>
+    <frame>
+      <ip>0x6ADDBEE</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QGuiEventDispatcherGlibPrivate::QGuiEventDispatcherGlibPrivate()</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qguieventdispatcher_glib.cpp</file>
+      <line>171</line>
+    </frame>
+    <frame>
+      <ip>0x6ADDCDD</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QGuiEventDispatcherGlib::QGuiEventDispatcherGlib(QObject*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qguieventdispatcher_glib.cpp</file>
+      <line>186</line>
+    </frame>
+    <frame>
+      <ip>0x6AA5152</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QApplicationPrivate::createEventDispatcher()</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qapplication_x11.cpp</file>
+      <line>605</line>
+    </frame>
+    <frame>
+      <ip>0x836D069</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QCoreApplication::init()</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/kernel</dir>
+      <file>qcoreapplication.cpp</file>
+      <line>552</line>
+    </frame>
+    <frame>
+      <ip>0x836D134</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QCoreApplication::QCoreApplication(QCoreApplicationPrivate&amp;)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/kernel</dir>
+      <file>qcoreapplication.cpp</file>
+      <line>477</line>
+    </frame>
+    <frame>
+      <ip>0x6A3815A</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QApplication::QApplication(int&amp;, char**, bool, int)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qapplication.cpp</file>
+      <line>745</line>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x7e4</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>544,542 (56 direct, 544,486 indirect) bytes in 1 blocks are definitely lost in loss record 2,003 of 2,003</text>
+    <leakedbytes>544542</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x4C284A8</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so</obj>
+      <fn>malloc</fn>
+      <dir>/build/buildd/valgrind-3.6.0~svn20100212/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>236</line>
+    </frame>
+    <frame>
+      <ip>0x82A1A6C</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QMapData::node_create(QMapData::Node**, int, int)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/tools</dir>
+      <file>qmap.cpp</file>
+      <line>140</line>
+    </frame>
+    <frame>
+      <ip>0x8336F68</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QMap&lt;QSettingsKey, QVariant&gt;::detach_helper()</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/../../include/QtCore/../../src/corelib/tools</dir>
+      <file>qmap.h</file>
+      <line>449</line>
+    </frame>
+    <frame>
+      <ip>0x832C564</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QConfFile::mergedKeyMap() const</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/../../include/QtCore/../../src/corelib/tools</dir>
+      <file>qmap.h</file>
+      <line>202</line>
+    </frame>
+    <frame>
+      <ip>0x833305A</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QConfFileSettingsPrivate::syncConfFile(int)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/io</dir>
+      <file>qsettings.cpp</file>
+      <line>1569</line>
+    </frame>
+    <frame>
+      <ip>0x8333D5B</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QConfFileSettingsPrivate::sync()</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/io</dir>
+      <file>qsettings.cpp</file>
+      <line>1386</line>
+    </frame>
+    <frame>
+      <ip>0x83260D9</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QSettingsPrivate::update()</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/io</dir>
+      <file>qsettings.cpp</file>
+      <line>415</line>
+    </frame>
+    <frame>
+      <ip>0x83267C7</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QSettings::event(QEvent*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/io</dir>
+      <file>qsettings.cpp</file>
+      <line>3326</line>
+    </frame>
+    <frame>
+      <ip>0x6A2B6EB</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QApplicationPrivate::notify_helper(QObject*, QEvent*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qapplication.cpp</file>
+      <line>4396</line>
+    </frame>
+    <frame>
+      <ip>0x6A311DC</ip>
+      <obj>/usr/lib/libQtGui.so.4.7.0</obj>
+      <fn>QApplication::notify(QObject*, QEvent*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/gui/kernel</dir>
+      <file>qapplication.cpp</file>
+      <line>4277</line>
+    </frame>
+    <frame>
+      <ip>0x6443535</ip>
+      <obj>/usr/lib/libkdeui.so.5.5.0</obj>
+      <fn>KApplication::notify(QObject*, QEvent*)</fn>
+    </frame>
+    <frame>
+      <ip>0x83690AB</ip>
+      <obj>/usr/lib/libQtCore.so.4.7.0</obj>
+      <fn>QCoreApplication::notifyInternal(QObject*, QEvent*)</fn>
+      <dir>/build/buildd/qt4-x11-4.7.0/src/corelib/kernel</dir>
+      <file>qcoreapplication.cpp</file>
+      <line>732</line>
+    </frame>
+  </stack>
+</error>
+
+<errorcounts>
+  <pair>
+    <count>2</count>
+    <unique>0x9</unique>
+  </pair>
+</errorcounts>
+
+<suppcounts>
+  <pair>
+    <count>12</count>
+    <name>X on SUSE11 writev uninit padding</name>
+  </pair>
+  <pair>
+    <count>2</count>
+    <name>dl-hack3-cond-1</name>
+  </pair>
+  <pair>
+    <count>2</count>
+    <name>glibc-2.5.x-on-SUSE-10.2-(PPC)-2a</name>
+  </pair>
+</suppcounts>
+
+</valgrindoutput>
+
diff --git a/tests/auto/valgrind/memcheck/data/memcheck-output-untitled.xml b/tests/auto/valgrind/memcheck/data/memcheck-output-untitled.xml
new file mode 100644
index 0000000000..d4678d6592
--- /dev/null
+++ b/tests/auto/valgrind/memcheck/data/memcheck-output-untitled.xml
@@ -0,0 +1,984 @@
+<?xml version="1.0"?>
+
+<valgrindoutput>
+
+<protocolversion>4</protocolversion>
+<protocoltool>memcheck</protocoltool>
+
+<preamble>
+  <line>Memcheck, a memory error detector</line>
+  <line>Copyright (C) 2002-2010, and GNU GPL'd, by Julian Seward et al.</line>
+  <line>Using Valgrind-3.6.1 and LibVEX; rerun with -h for copyright info</line>
+  <line>Command: /home/chris/untitled/untitled</line>
+</preamble>
+
+<pid>20854</pid>
+<ppid>20386</ppid>
+<tool>memcheck</tool>
+
+<args>
+  <vargv>
+    <exe>/usr/bin/valgrind.bin</exe>
+    <arg>--suppressions=/usr/lib/valgrind/debian-libc6-dbg.supp</arg>
+    <arg>--xml=yes</arg>
+    <arg>--xml-file=/tmp/bla</arg>
+  </vargv>
+  <argv>
+    <exe>/home/chris/untitled/untitled</exe>
+  </argv>
+</args>
+
+<status>
+  <state>RUNNING</state>
+  <time>00:00:00:00.161 </time>
+</status>
+
+
+<status>
+  <state>FINISHED</state>
+  <time>00:00:00:12.379 </time>
+</status>
+
+<error>
+  <unique>0x107</unique>
+  <tid>1</tid>
+  <kind>Leak_PossiblyLost</kind>
+  <xwhat>
+    <text>120 bytes in 1 blocks are possibly lost in loss record 184 of 270</text>
+    <leakedbytes>120</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x402517B</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>memalign</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>581</line>
+    </frame>
+    <frame>
+      <ip>0x40251D8</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>posix_memalign</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>709</line>
+    </frame>
+    <frame>
+      <ip>0x42BE546</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+    </frame>
+    <frame>
+      <ip>0x42BFA2F</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_slice_alloc</fn>
+    </frame>
+    <frame>
+      <ip>0x42C06DD</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_slist_prepend</fn>
+    </frame>
+    <frame>
+      <ip>0x42C368E</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_strsplit</fn>
+    </frame>
+    <frame>
+      <ip>0x42D9393</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_get_language_names</fn>
+    </frame>
+    <frame>
+      <ip>0x42D98E6</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+    </frame>
+    <frame>
+      <ip>0x42CB919</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_thread_init_glib</fn>
+    </frame>
+    <frame>
+      <ip>0x4254506</ip>
+      <obj>/usr/lib/i386-linux-gnu/libgthread-2.0.so.0.2800.6</obj>
+      <fn>g_thread_init</fn>
+    </frame>
+    <frame>
+      <ip>0x8D4D458</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(_GMainContext*)</fn>
+    </frame>
+    <frame>
+      <ip>0x85C7CA5</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QGuiEventDispatcherGlibPrivate::QGuiEventDispatcherGlibPrivate()</fn>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x109</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>122 (56 direct, 66 indirect) bytes in 1 blocks are definitely lost in loss record 186 of 270</text>
+    <leakedbytes>122</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x402641D</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>operator new(unsigned int)</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>255</line>
+    </frame>
+    <frame>
+      <ip>0x8D0FC45</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibraryPrivate::findOrCreate(QString const&amp;, QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D10347</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibrary::setFileNameAndVersion(QString const&amp;, int)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D10404</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibrary::QLibrary(QString const&amp;, int, QObject*)</fn>
+    </frame>
+    <frame>
+      <ip>0x859BD96</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>qt_load_library_runtime(char const*, int, int, char const*)</fn>
+    </frame>
+    <frame>
+      <ip>0x859C93C</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long)</fn>
+    </frame>
+    <frame>
+      <ip>0x853EEDC</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long)</fn>
+    </frame>
+    <frame>
+      <ip>0x853F766</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QApplication::QApplication(int&amp;, char**, int)</fn>
+    </frame>
+    <frame>
+      <ip>0x805209E</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>createApplication(int&amp;, char**)</fn>
+      <dir>/home/chris/untitled/qmlapplicationviewer</dir>
+      <file>qmlapplicationviewer.cpp</file>
+      <line>175</line>
+    </frame>
+    <frame>
+      <ip>0x805185F</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>main</fn>
+      <dir>/home/chris/untitled</dir>
+      <file>main.cpp</file>
+      <line>6</line>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x10a</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>124 bytes in 1 blocks are definitely lost in loss record 187 of 270</text>
+    <leakedbytes>124</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x4026864</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>malloc</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>236</line>
+    </frame>
+    <frame>
+      <ip>0x4635902</ip>
+      <obj>/usr/lib/i386-linux-gnu/libxcb.so.1.1.0</obj>
+      <fn>get_peer_sock_name</fn>
+      <dir>/build/buildd/libxcb-1.7/obj-i686-linux-gnu/src/../../src</dir>
+      <file>xcb_auth.c</file>
+      <line>259</line>
+    </frame>
+    <frame>
+      <ip>0x4635A04</ip>
+      <obj>/usr/lib/i386-linux-gnu/libxcb.so.1.1.0</obj>
+      <fn>_xcb_get_auth_info</fn>
+      <dir>/build/buildd/libxcb-1.7/obj-i686-linux-gnu/src/../../src</dir>
+      <file>xcb_auth.c</file>
+      <line>302</line>
+    </frame>
+    <frame>
+      <ip>0x46353D1</ip>
+      <obj>/usr/lib/i386-linux-gnu/libxcb.so.1.1.0</obj>
+      <fn>xcb_connect_to_display_with_auth_info</fn>
+      <dir>/build/buildd/libxcb-1.7/obj-i686-linux-gnu/src/../../src</dir>
+      <file>xcb_util.c</file>
+      <line>424</line>
+    </frame>
+    <frame>
+      <ip>0x46355DB</ip>
+      <obj>/usr/lib/i386-linux-gnu/libxcb.so.1.1.0</obj>
+      <fn>xcb_connect</fn>
+      <dir>/build/buildd/libxcb-1.7/obj-i686-linux-gnu/src/../../src</dir>
+      <file>xcb_util.c</file>
+      <line>395</line>
+    </frame>
+    <frame>
+      <ip>0x4169A22</ip>
+      <obj>/usr/lib/i386-linux-gnu/libX11.so.6.3.0</obj>
+      <fn>_XConnectXCB</fn>
+    </frame>
+    <frame>
+      <ip>0x41598F3</ip>
+      <obj>/usr/lib/i386-linux-gnu/libX11.so.6.3.0</obj>
+      <fn>XOpenDisplay</fn>
+    </frame>
+    <frame>
+      <ip>0x859E45F</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long)</fn>
+    </frame>
+    <frame>
+      <ip>0x853EEDC</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long)</fn>
+    </frame>
+    <frame>
+      <ip>0x853F766</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QApplication::QApplication(int&amp;, char**, int)</fn>
+    </frame>
+    <frame>
+      <ip>0x805209E</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>createApplication(int&amp;, char**)</fn>
+      <dir>/home/chris/untitled/qmlapplicationviewer</dir>
+      <file>qmlapplicationviewer.cpp</file>
+      <line>175</line>
+    </frame>
+    <frame>
+      <ip>0x805185F</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>main</fn>
+      <dir>/home/chris/untitled</dir>
+      <file>main.cpp</file>
+      <line>6</line>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x10f</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>138 (56 direct, 82 indirect) bytes in 1 blocks are definitely lost in loss record 192 of 270</text>
+    <leakedbytes>138</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x402641D</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>operator new(unsigned int)</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>255</line>
+    </frame>
+    <frame>
+      <ip>0x8D0FC45</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibraryPrivate::findOrCreate(QString const&amp;, QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D10347</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibrary::setFileNameAndVersion(QString const&amp;, int)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D10404</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibrary::QLibrary(QString const&amp;, int, QObject*)</fn>
+    </frame>
+    <frame>
+      <ip>0x859BD96</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>qt_load_library_runtime(char const*, int, int, char const*)</fn>
+    </frame>
+    <frame>
+      <ip>0x859DE94</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long)</fn>
+    </frame>
+    <frame>
+      <ip>0x853EEDC</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long)</fn>
+    </frame>
+    <frame>
+      <ip>0x853F766</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QApplication::QApplication(int&amp;, char**, int)</fn>
+    </frame>
+    <frame>
+      <ip>0x805209E</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>createApplication(int&amp;, char**)</fn>
+      <dir>/home/chris/untitled/qmlapplicationviewer</dir>
+      <file>qmlapplicationviewer.cpp</file>
+      <line>175</line>
+    </frame>
+    <frame>
+      <ip>0x805185F</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>main</fn>
+      <dir>/home/chris/untitled</dir>
+      <file>main.cpp</file>
+      <line>6</line>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x114</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>158 (56 direct, 102 indirect) bytes in 1 blocks are definitely lost in loss record 197 of 270</text>
+    <leakedbytes>158</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x402641D</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>operator new(unsigned int)</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>255</line>
+    </frame>
+    <frame>
+      <ip>0x8D0FC45</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibraryPrivate::findOrCreate(QString const&amp;, QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D1023F</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibrary::setFileNameAndVersion(QString const&amp;, QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D102A4</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibrary::QLibrary(QString const&amp;, QString const&amp;, QObject*)</fn>
+    </frame>
+    <frame>
+      <ip>0x8C8FCCD</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>qt_initIcu(QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8C4B0CF</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLocalePrivate::updateSystemPrivate()</fn>
+    </frame>
+    <frame>
+      <ip>0x8C4B3C6</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>systemPrivate()</fn>
+    </frame>
+    <frame>
+      <ip>0x8C4B40C</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>defaultPrivate()</fn>
+    </frame>
+    <frame>
+      <ip>0x8C4B55F</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLocale::QLocale()</fn>
+    </frame>
+    <frame>
+      <ip>0x8CCF6F3</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QResourceFileEngine::QResourceFileEngine(QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8CF87DC</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>_q_resolveEntryAndCreateLegacyEngine_recursive(QFileSystemEntry&amp;, QFileSystemMetaData&amp;, QAbstractFileEngine*&amp;, bool)</fn>
+    </frame>
+    <frame>
+      <ip>0x8CF8947</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QFileSystemEngine::resolveEntryAndCreateLegacyEngine(QFileSystemEntry&amp;, QFileSystemMetaData&amp;)</fn>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x116</unique>
+  <tid>1</tid>
+  <kind>Leak_PossiblyLost</kind>
+  <xwhat>
+    <text>160 bytes in 1 blocks are possibly lost in loss record 199 of 270</text>
+    <leakedbytes>160</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x4025315</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>calloc</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>467</line>
+    </frame>
+    <frame>
+      <ip>0x4010CD7</ip>
+      <obj>/lib/i386-linux-gnu/ld-2.13.so</obj>
+      <fn>allocate_dtv</fn>
+      <dir>/build/buildd/eglibc-2.13/elf</dir>
+      <file>dl-tls.c</file>
+      <line>300</line>
+    </frame>
+    <frame>
+      <ip>0x401146B</ip>
+      <obj>/lib/i386-linux-gnu/ld-2.13.so</obj>
+      <fn>_dl_allocate_tls</fn>
+      <dir>/build/buildd/eglibc-2.13/elf</dir>
+      <file>dl-tls.c</file>
+      <line>464</line>
+    </frame>
+    <frame>
+      <ip>0x433E5C6</ip>
+      <obj>/lib/i386-linux-gnu/libpthread-2.13.so</obj>
+      <fn>pthread_create@@GLIBC_2.1</fn>
+      <dir>/build/buildd/eglibc-2.13/nptl</dir>
+      <file>allocatestack.c</file>
+      <line>570</line>
+    </frame>
+    <frame>
+      <ip>0x83A6BED</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QTWTF::TCMalloc_PageHeap::initializeScavenger()</fn>
+    </frame>
+    <frame>
+      <ip>0x83A92E9</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QTWTF::TCMalloc_ThreadCache::InitModule()</fn>
+    </frame>
+    <frame>
+      <ip>0x83AA188</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QTWTF::fastMalloc(unsigned int)</fn>
+    </frame>
+    <frame>
+      <ip>0x83AEE4B</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QTWTF::initializeThreading()</fn>
+    </frame>
+    <frame>
+      <ip>0x8338CBF</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QTJSC::initializeThreading()</fn>
+    </frame>
+    <frame>
+      <ip>0x82897BE</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QScriptEnginePrivate::QScriptEnginePrivate()</fn>
+    </frame>
+    <frame>
+      <ip>0x828AAB2</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QScriptEngine::QScriptEngine()</fn>
+    </frame>
+    <frame>
+      <ip>0x8063261</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QDeclarativeScriptEngine::QDeclarativeScriptEngine(QDeclarativeEnginePrivate*)</fn>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x117</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>160 (40 direct, 120 indirect) bytes in 1 blocks are definitely lost in loss record 200 of 270</text>
+    <leakedbytes>160</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x4026864</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>malloc</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>236</line>
+    </frame>
+    <frame>
+      <ip>0x4565FAB</ip>
+      <obj>/lib/i386-linux-gnu/libc-2.13.so</obj>
+      <fn>nss_parse_service_list</fn>
+      <dir>/build/buildd/eglibc-2.13/nss</dir>
+      <file>nsswitch.c</file>
+      <line>626</line>
+    </frame>
+    <frame>
+      <ip>0x4566584</ip>
+      <obj>/lib/i386-linux-gnu/libc-2.13.so</obj>
+      <fn>__nss_database_lookup</fn>
+      <dir>/build/buildd/eglibc-2.13/nss</dir>
+      <file>nsswitch.c</file>
+      <line>167</line>
+    </frame>
+    <frame>
+      <ip>0x6BAAE9B</ip>
+    </frame>
+    <frame>
+      <ip>0x6BAC9F4</ip>
+    </frame>
+    <frame>
+      <ip>0x451C7EA</ip>
+      <obj>/lib/i386-linux-gnu/libc-2.13.so</obj>
+      <fn>getpwuid_r@@GLIBC_2.1.2</fn>
+      <dir>/build/buildd/eglibc-2.13/pwd/../nss</dir>
+      <file>getXXbyYY_r.c</file>
+      <line>256</line>
+    </frame>
+    <frame>
+      <ip>0x85A34E4</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>sm_performSaveYourself(QSessionManagerPrivate*)</fn>
+    </frame>
+    <frame>
+      <ip>0x85A3F56</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>sm_saveYourselfCallback(_SmcConn*, void*, int, int, int, int)</fn>
+    </frame>
+    <frame>
+      <ip>0x4047727</ip>
+      <obj>/usr/lib/i386-linux-gnu/libSM.so.6.0.1</obj>
+      <fn>_SmcProcessMessage</fn>
+    </frame>
+    <frame>
+      <ip>0x405D1B5</ip>
+      <obj>/usr/lib/i386-linux-gnu/libICE.so.6.3.0</obj>
+      <fn>IceProcessMessages</fn>
+    </frame>
+    <frame>
+      <ip>0x858FE67</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QSmSocketReceiver::socketActivated(int)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D3A9C1</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QMetaObject::activate(QObject*, QMetaObject const*, int, void**)</fn>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x118</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>166 (56 direct, 110 indirect) bytes in 1 blocks are definitely lost in loss record 201 of 270</text>
+    <leakedbytes>166</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x402641D</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>operator new(unsigned int)</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>255</line>
+    </frame>
+    <frame>
+      <ip>0x8D0FC45</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibraryPrivate::findOrCreate(QString const&amp;, QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D1023F</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibrary::setFileNameAndVersion(QString const&amp;, QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8D102A4</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLibrary::QLibrary(QString const&amp;, QString const&amp;, QObject*)</fn>
+    </frame>
+    <frame>
+      <ip>0x8C8FA56</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>qt_initIcu(QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8C4B0CF</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLocalePrivate::updateSystemPrivate()</fn>
+    </frame>
+    <frame>
+      <ip>0x8C4B3C6</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>systemPrivate()</fn>
+    </frame>
+    <frame>
+      <ip>0x8C4B40C</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>defaultPrivate()</fn>
+    </frame>
+    <frame>
+      <ip>0x8C4B55F</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QLocale::QLocale()</fn>
+    </frame>
+    <frame>
+      <ip>0x8CCF6F3</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QResourceFileEngine::QResourceFileEngine(QString const&amp;)</fn>
+    </frame>
+    <frame>
+      <ip>0x8CF87DC</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>_q_resolveEntryAndCreateLegacyEngine_recursive(QFileSystemEntry&amp;, QFileSystemMetaData&amp;, QAbstractFileEngine*&amp;, bool)</fn>
+    </frame>
+    <frame>
+      <ip>0x8CF8947</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QFileSystemEngine::resolveEntryAndCreateLegacyEngine(QFileSystemEntry&amp;, QFileSystemMetaData&amp;)</fn>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x11d</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>216 bytes in 1 blocks are definitely lost in loss record 206 of 270</text>
+    <leakedbytes>216</leakedbytes>
+    <leakedblocks>1</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x4026864</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>malloc</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>236</line>
+    </frame>
+    <frame>
+      <ip>0x4193FB2</ip>
+      <obj>/usr/lib/i386-linux-gnu/libX11.so.6.3.0</obj>
+      <fn>_XimOpenIM</fn>
+    </frame>
+    <frame>
+      <ip>0x4193BCF</ip>
+      <obj>/usr/lib/i386-linux-gnu/libX11.so.6.3.0</obj>
+      <fn>_XimRegisterIMInstantiateCallback</fn>
+    </frame>
+    <frame>
+      <ip>0x41789A7</ip>
+      <obj>/usr/lib/i386-linux-gnu/libX11.so.6.3.0</obj>
+      <fn>XRegisterIMInstantiateCallback</fn>
+    </frame>
+    <frame>
+      <ip>0x89FB291</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QXIMInputContext::QXIMInputContext()</fn>
+    </frame>
+    <frame>
+      <ip>0x89F9450</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QInputContextFactory::create(QString const&amp;, QObject*)</fn>
+    </frame>
+    <frame>
+      <ip>0x85361C7</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QApplication::inputContext() const</fn>
+    </frame>
+    <frame>
+      <ip>0x85662A7</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QWidgetPrivate::inputContext() const</fn>
+    </frame>
+    <frame>
+      <ip>0x8571D7C</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QWidget::setAttribute(Qt::WidgetAttribute, bool)</fn>
+    </frame>
+    <frame>
+      <ip>0x8A54527</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QGraphicsViewPrivate::updateInputMethodSensitivity()</fn>
+    </frame>
+    <frame>
+      <ip>0x8A55E1A</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QGraphicsView::setScene(QGraphicsScene*)</fn>
+    </frame>
+    <frame>
+      <ip>0x805273E</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QDeclarativeViewPrivate::init()</fn>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x126</unique>
+  <tid>1</tid>
+  <kind>Leak_PossiblyLost</kind>
+  <xwhat>
+    <text>360 bytes in 3 blocks are possibly lost in loss record 215 of 270</text>
+    <leakedbytes>360</leakedbytes>
+    <leakedblocks>3</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x402517B</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>memalign</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>581</line>
+    </frame>
+    <frame>
+      <ip>0x40251D8</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>posix_memalign</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>709</line>
+    </frame>
+    <frame>
+      <ip>0x42BE546</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+    </frame>
+    <frame>
+      <ip>0x42BFA4C</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_slice_alloc</fn>
+    </frame>
+    <frame>
+      <ip>0x42C06DD</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_slist_prepend</fn>
+    </frame>
+    <frame>
+      <ip>0x42C368E</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_strsplit</fn>
+    </frame>
+    <frame>
+      <ip>0x42D9393</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_get_language_names</fn>
+    </frame>
+    <frame>
+      <ip>0x42D98E6</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+    </frame>
+    <frame>
+      <ip>0x42CB919</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_thread_init_glib</fn>
+    </frame>
+    <frame>
+      <ip>0x4254506</ip>
+      <obj>/usr/lib/i386-linux-gnu/libgthread-2.0.so.0.2800.6</obj>
+      <fn>g_thread_init</fn>
+    </frame>
+    <frame>
+      <ip>0x8D4D458</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(_GMainContext*)</fn>
+    </frame>
+    <frame>
+      <ip>0x85C7CA5</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QGuiEventDispatcherGlibPrivate::QGuiEventDispatcherGlibPrivate()</fn>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x128</unique>
+  <tid>1</tid>
+  <kind>Leak_DefinitelyLost</kind>
+  <xwhat>
+    <text>396 (256 direct, 140 indirect) bytes in 2 blocks are definitely lost in loss record 217 of 270</text>
+    <leakedbytes>396</leakedbytes>
+    <leakedblocks>2</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x4026864</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>malloc</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>236</line>
+    </frame>
+    <frame>
+      <ip>0x4086087</ip>
+      <obj>/usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4</obj>
+    </frame>
+    <frame>
+      <ip>0x4086F7C</ip>
+      <obj>/usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4</obj>
+    </frame>
+    <frame>
+      <ip>0x4087073</ip>
+      <obj>/usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4</obj>
+    </frame>
+    <frame>
+      <ip>0x408C6EB</ip>
+      <obj>/usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4</obj>
+    </frame>
+    <frame>
+      <ip>0x4607790</ip>
+      <obj>/lib/i386-linux-gnu/libexpat.so.1.5.2</obj>
+    </frame>
+    <frame>
+      <ip>0x4608670</ip>
+      <obj>/lib/i386-linux-gnu/libexpat.so.1.5.2</obj>
+    </frame>
+    <frame>
+      <ip>0x4608F92</ip>
+      <obj>/lib/i386-linux-gnu/libexpat.so.1.5.2</obj>
+    </frame>
+    <frame>
+      <ip>0x460A7D9</ip>
+      <obj>/lib/i386-linux-gnu/libexpat.so.1.5.2</obj>
+    </frame>
+    <frame>
+      <ip>0x460C5F2</ip>
+      <obj>/lib/i386-linux-gnu/libexpat.so.1.5.2</obj>
+      <fn>XML_ParseBuffer</fn>
+    </frame>
+    <frame>
+      <ip>0x408B2B2</ip>
+      <obj>/usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4</obj>
+      <fn>FcConfigParseAndLoad</fn>
+    </frame>
+    <frame>
+      <ip>0x408B60B</ip>
+      <obj>/usr/lib/i386-linux-gnu/libfontconfig.so.1.4.4</obj>
+      <fn>FcConfigParseAndLoad</fn>
+    </frame>
+  </stack>
+</error>
+
+<error>
+  <unique>0x144</unique>
+  <tid>1</tid>
+  <kind>Leak_PossiblyLost</kind>
+  <xwhat>
+    <text>1,240 bytes in 5 blocks are possibly lost in loss record 245 of 270</text>
+    <leakedbytes>1240</leakedbytes>
+    <leakedblocks>5</leakedblocks>
+  </xwhat>
+  <stack>
+    <frame>
+      <ip>0x402517B</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>memalign</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>581</line>
+    </frame>
+    <frame>
+      <ip>0x40251D8</ip>
+      <obj>/usr/lib/valgrind/vgpreload_memcheck-x86-linux.so</obj>
+      <fn>posix_memalign</fn>
+      <dir>/build/buildd/valgrind-3.6.1/coregrind/m_replacemalloc</dir>
+      <file>vg_replace_malloc.c</file>
+      <line>709</line>
+    </frame>
+    <frame>
+      <ip>0x42BE546</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+    </frame>
+    <frame>
+      <ip>0x42BFA4C</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_slice_alloc</fn>
+    </frame>
+    <frame>
+      <ip>0x42729D8</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_array_sized_new</fn>
+    </frame>
+    <frame>
+      <ip>0x4272AB2</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_array_new</fn>
+    </frame>
+    <frame>
+      <ip>0x42CB7FE</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_static_private_set</fn>
+    </frame>
+    <frame>
+      <ip>0x4282D0E</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_get_filename_charsets</fn>
+    </frame>
+    <frame>
+      <ip>0x4282D9C</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+    </frame>
+    <frame>
+      <ip>0x42CB909</ip>
+      <obj>/lib/i386-linux-gnu/libglib-2.0.so.0.2800.6</obj>
+      <fn>g_thread_init_glib</fn>
+    </frame>
+    <frame>
+      <ip>0x4254506</ip>
+      <obj>/usr/lib/i386-linux-gnu/libgthread-2.0.so.0.2800.6</obj>
+      <fn>g_thread_init</fn>
+    </frame>
+    <frame>
+      <ip>0x8D4D458</ip>
+      <obj>/home/chris/untitled/untitled</obj>
+      <fn>QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(_GMainContext*)</fn>
+    </frame>
+  </stack>
+</error>
+
+<errorcounts>
+</errorcounts>
+
+<suppcounts>
+  <pair>
+    <count>80</count>
+    <name>U1004-ARM-_dl_relocate_object</name>
+  </pair>
+</suppcounts>
+
+</valgrindoutput>
+
diff --git a/tests/valgrind/memcheck/memcheck.pro b/tests/auto/valgrind/memcheck/memcheck.pro
index eed8482d76..eed8482d76 100644
--- a/tests/valgrind/memcheck/memcheck.pro
+++ b/tests/auto/valgrind/memcheck/memcheck.pro
diff --git a/tests/valgrind/memcheck/modeldemo.cpp b/tests/auto/valgrind/memcheck/modeldemo.cpp
index cf0e66fd1b..2c52ed30c0 100644
--- a/tests/valgrind/memcheck/modeldemo.cpp
+++ b/tests/auto/valgrind/memcheck/modeldemo.cpp
@@ -44,7 +44,7 @@ using namespace Valgrind::XmlProtocol;
 
 static QString fakeValgrindExecutable()
 {
-    return QCoreApplication::applicationDirPath() + QLatin1String("/../../valgrind-fake/valgrind-fake");
+    return QLatin1String(VALGRIND_FAKE_PATH);
 }
 
 static QString dataFile(const QLatin1String &file)
diff --git a/tests/valgrind/memcheck/modeldemo.h b/tests/auto/valgrind/memcheck/modeldemo.h
index 850f60307b..850f60307b 100644
--- a/tests/valgrind/memcheck/modeldemo.h
+++ b/tests/auto/valgrind/memcheck/modeldemo.h
diff --git a/tests/valgrind/memcheck/modeldemo.pro b/tests/auto/valgrind/memcheck/modeldemo.pro
index 5ce312ede7..24308f124e 100644
--- a/tests/valgrind/memcheck/modeldemo.pro
+++ b/tests/auto/valgrind/memcheck/modeldemo.pro
@@ -1,5 +1,6 @@
-include(../../../qtcreator.pri)
-include(../../auto/qttestrpath.pri)
+include(../../../../qtcreator.pri)
+include(../../qttestrpath.pri)
+include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
 include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
@@ -12,7 +13,7 @@ macx:CONFIG -= app_bundle
 QT += gui network
 
 DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
-
+DEFINES += "VALGRIND_FAKE_PATH=\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\""
 
 SOURCES += modeldemo.cpp
 
diff --git a/tests/valgrind/memcheck/parsertests.cpp b/tests/auto/valgrind/memcheck/parsertests.cpp
index cf72a3f97f..b665f9efc1 100644
--- a/tests/valgrind/memcheck/parsertests.cpp
+++ b/tests/auto/valgrind/memcheck/parsertests.cpp
@@ -48,6 +48,12 @@
 #include <iostream>
 #include <QProcess>
 
+#if  QT_VERSION >= 0x050000
+#define MSKIP_SINGLE(x) QSKIP(x)
+#else
+#define MSKIP_SINGLE(x) QSKIP(x, SkipSingle)
+#endif
+
 using namespace Valgrind;
 using namespace Valgrind::XmlProtocol;
 
@@ -143,6 +149,8 @@ void ParserTests::cleanup()
 
 void ParserTests::testHelgrindSample1()
 {
+    MSKIP_SINGLE("testfile does not exist");
+
     initTest(QLatin1String("helgrind-output-sample1.xml"));
 
     QList<Error> expectedErrors;
@@ -313,6 +321,8 @@ void ParserTests::testMemcheckSample1()
 
 void ParserTests::testMemcheckSample2()
 {
+    MSKIP_SINGLE("testfile does not exist");
+
     initTest(QLatin1String("memcheck-output-sample2.xml"));
 
     Valgrind::XmlProtocol::Parser parser;
@@ -337,6 +347,8 @@ void ParserTests::testMemcheckSample2()
 
 void ParserTests::testMemcheckSample3()
 {
+    MSKIP_SINGLE("testfile does not exist");
+
     initTest(QLatin1String("memcheck-output-sample3.xml"));
 
     Valgrind::XmlProtocol::Parser parser;
@@ -387,8 +399,10 @@ void ParserTests::testMemcheckSample3()
 
 void ParserTests::testMemcheckCharm()
 {
+    MSKIP_SINGLE("testfile does not exist");
+
     // a somewhat larger file, to make sure buffering and partial I/O works ok
-    initTest(QLatin1String("memcheck-output-charm.xml"));
+    initTest(QLatin1String("memcheck-output-untitled.xml"));
 
     Valgrind::XmlProtocol::Parser parser;
     Recorder rec(&parser);
diff --git a/tests/valgrind/memcheck/parsertests.h b/tests/auto/valgrind/memcheck/parsertests.h
index 52c481cb70..0059564cae 100644
--- a/tests/valgrind/memcheck/parsertests.h
+++ b/tests/auto/valgrind/memcheck/parsertests.h
@@ -76,9 +76,9 @@ public Q_SLOTS:
         errors.append(err);
     }
 
-    void errorCount(qint64 uniq, qint64 count)
+    void errorCount(qint64 unique, qint64 count)
     {
-        errorcounts.push_back(qMakePair(uniq, count));
+        errorcounts.push_back(qMakePair(unique, count));
     }
 
     void suppressionCount(const QString &name, qint64 count)
diff --git a/tests/valgrind/memcheck/parsertests.pro b/tests/auto/valgrind/memcheck/parsertests.pro
index 8da114d90f..d8faf95b4b 100644
--- a/tests/valgrind/memcheck/parsertests.pro
+++ b/tests/auto/valgrind/memcheck/parsertests.pro
@@ -1,13 +1,14 @@
-include(../../auto/qttest.pri)
+include(../../qttest.pri)
+include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
 include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
 
-TARGET = parsertests
+TARGET = tst_parsertests
 
 QT += network
 
-DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$PWD/data\\\""
+DEFINES += "PARSERTESTS_DATA_DIR=\\\"$$_PRO_FILE_PWD_/data\\\""
 DEFINES += "VALGRIND_FAKE_PATH=\\\"$$IDE_BUILD_TREE/src/tools/valgrindfake/valgrind-fake\\\""
 
 SOURCES += parsertests.cpp
diff --git a/tests/valgrind/memcheck/testapps/free1/free1.pro b/tests/auto/valgrind/memcheck/testapps/free1/free1.pro
index 0b7ac8d808..0b7ac8d808 100644
--- a/tests/valgrind/memcheck/testapps/free1/free1.pro
+++ b/tests/auto/valgrind/memcheck/testapps/free1/free1.pro
diff --git a/tests/valgrind/memcheck/testapps/free1/main.cpp b/tests/auto/valgrind/memcheck/testapps/free1/main.cpp
index 1dbd64bf4f..1dbd64bf4f 100644
--- a/tests/valgrind/memcheck/testapps/free1/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/free1/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/free2/free2.pro b/tests/auto/valgrind/memcheck/testapps/free2/free2.pro
index 1c1f7a5098..1c1f7a5098 100644
--- a/tests/valgrind/memcheck/testapps/free2/free2.pro
+++ b/tests/auto/valgrind/memcheck/testapps/free2/free2.pro
diff --git a/tests/valgrind/memcheck/testapps/free2/main.cpp b/tests/auto/valgrind/memcheck/testapps/free2/main.cpp
index 664b81ddf3..664b81ddf3 100644
--- a/tests/valgrind/memcheck/testapps/free2/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/free2/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/invalidjump/invalidjump.pro b/tests/auto/valgrind/memcheck/testapps/invalidjump/invalidjump.pro
index 7f7a231327..7f7a231327 100644
--- a/tests/valgrind/memcheck/testapps/invalidjump/invalidjump.pro
+++ b/tests/auto/valgrind/memcheck/testapps/invalidjump/invalidjump.pro
diff --git a/tests/valgrind/memcheck/testapps/invalidjump/main.cpp b/tests/auto/valgrind/memcheck/testapps/invalidjump/main.cpp
index bc9fa8bd6d..bc9fa8bd6d 100644
--- a/tests/valgrind/memcheck/testapps/invalidjump/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/invalidjump/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/leak1/leak1.pro b/tests/auto/valgrind/memcheck/testapps/leak1/leak1.pro
index 2b5b6b8be8..2b5b6b8be8 100644
--- a/tests/valgrind/memcheck/testapps/leak1/leak1.pro
+++ b/tests/auto/valgrind/memcheck/testapps/leak1/leak1.pro
diff --git a/tests/valgrind/memcheck/testapps/leak1/main.cpp b/tests/auto/valgrind/memcheck/testapps/leak1/main.cpp
index a531d66085..a531d66085 100644
--- a/tests/valgrind/memcheck/testapps/leak1/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/leak1/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/leak2/leak2.pro b/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro
index 8b9b2717a7..8b9b2717a7 100644
--- a/tests/valgrind/memcheck/testapps/leak2/leak2.pro
+++ b/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro
diff --git a/tests/valgrind/memcheck/testapps/leak2/main.cpp b/tests/auto/valgrind/memcheck/testapps/leak2/main.cpp
index bee6ef2990..bee6ef2990 100644
--- a/tests/valgrind/memcheck/testapps/leak2/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/leak2/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/leak3/leak3.pro b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro
index aaefab13df..aaefab13df 100644
--- a/tests/valgrind/memcheck/testapps/leak3/leak3.pro
+++ b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro
diff --git a/tests/valgrind/memcheck/testapps/leak3/main.cpp b/tests/auto/valgrind/memcheck/testapps/leak3/main.cpp
index 5f972ef434..5f972ef434 100644
--- a/tests/valgrind/memcheck/testapps/leak3/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/leak3/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/leak4/leak4.pro b/tests/auto/valgrind/memcheck/testapps/leak4/leak4.pro
index ebbafbd51a..ebbafbd51a 100644
--- a/tests/valgrind/memcheck/testapps/leak4/leak4.pro
+++ b/tests/auto/valgrind/memcheck/testapps/leak4/leak4.pro
diff --git a/tests/valgrind/memcheck/testapps/leak4/main.cpp b/tests/auto/valgrind/memcheck/testapps/leak4/main.cpp
index ddab9fa60e..ddab9fa60e 100644
--- a/tests/valgrind/memcheck/testapps/leak4/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/leak4/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/overlap/main.cpp b/tests/auto/valgrind/memcheck/testapps/overlap/main.cpp
index 1ef99bb299..1ef99bb299 100644
--- a/tests/valgrind/memcheck/testapps/overlap/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/overlap/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/overlap/overlap.pro b/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro
index cad970b1fa..cad970b1fa 100644
--- a/tests/valgrind/memcheck/testapps/overlap/overlap.pro
+++ b/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro
diff --git a/tests/valgrind/memcheck/testapps/syscall/main.cpp b/tests/auto/valgrind/memcheck/testapps/syscall/main.cpp
index 01e8b22bac..01e8b22bac 100644
--- a/tests/valgrind/memcheck/testapps/syscall/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/syscall/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/syscall/syscall.pro b/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro
index e54d4d379e..e54d4d379e 100644
--- a/tests/valgrind/memcheck/testapps/syscall/syscall.pro
+++ b/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro
diff --git a/tests/valgrind/memcheck/testapps/testapps.pro b/tests/auto/valgrind/memcheck/testapps/testapps.pro
index 90490cf34c..90490cf34c 100644
--- a/tests/valgrind/memcheck/testapps/testapps.pro
+++ b/tests/auto/valgrind/memcheck/testapps/testapps.pro
diff --git a/tests/valgrind/memcheck/testapps/uninit1/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit1/main.cpp
index 6ddd7f39b0..6ddd7f39b0 100644
--- a/tests/valgrind/memcheck/testapps/uninit1/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/uninit1/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/uninit1/uninit1.pro b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro
index 26ab0e0689..26ab0e0689 100644
--- a/tests/valgrind/memcheck/testapps/uninit1/uninit1.pro
+++ b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro
diff --git a/tests/valgrind/memcheck/testapps/uninit2/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit2/main.cpp
index e472fc5470..e472fc5470 100644
--- a/tests/valgrind/memcheck/testapps/uninit2/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/uninit2/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/uninit2/uninit2.pro b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro
index 7e5f89e0b5..7e5f89e0b5 100644
--- a/tests/valgrind/memcheck/testapps/uninit2/uninit2.pro
+++ b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro
diff --git a/tests/valgrind/memcheck/testapps/uninit3/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit3/main.cpp
index 6b251b2602..6b251b2602 100644
--- a/tests/valgrind/memcheck/testapps/uninit3/main.cpp
+++ b/tests/auto/valgrind/memcheck/testapps/uninit3/main.cpp
diff --git a/tests/valgrind/memcheck/testapps/uninit3/uninit3.pro b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro
index 102d0cae83..102d0cae83 100644
--- a/tests/valgrind/memcheck/testapps/uninit3/uninit3.pro
+++ b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro
diff --git a/tests/valgrind/memcheck/testrunner.cpp b/tests/auto/valgrind/memcheck/testrunner.cpp
index d445d3bdfe..0bd1f9656b 100644
--- a/tests/valgrind/memcheck/testrunner.cpp
+++ b/tests/auto/valgrind/memcheck/testrunner.cpp
@@ -56,7 +56,7 @@ using namespace Valgrind;
 using namespace Valgrind::XmlProtocol;
 using namespace Valgrind::Memcheck;
 
-//BEGIN Test Helpers and boilterplate code
+//BEGIN Test Helpers and boilerplate code
 
 TestRunner::TestRunner(QObject *parent)
     : QObject(parent),
diff --git a/tests/valgrind/memcheck/testrunner.h b/tests/auto/valgrind/memcheck/testrunner.h
index b6275370ab..b6275370ab 100644
--- a/tests/valgrind/memcheck/testrunner.h
+++ b/tests/auto/valgrind/memcheck/testrunner.h
diff --git a/tests/valgrind/memcheck/testrunner.pro b/tests/auto/valgrind/memcheck/testrunner.pro
index acfa3a2047..8e52ade154 100644
--- a/tests/valgrind/memcheck/testrunner.pro
+++ b/tests/auto/valgrind/memcheck/testrunner.pro
@@ -1,9 +1,9 @@
-include(../../auto/qttest.pri)
+include(../../qttest.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 include($$IDE_SOURCE_TREE/src/libs/ssh/ssh.pri)
 include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
 
-TARGET = testrunner
+TARGET = tst_testrunner
 
 DEFINES += "TESTRUNNER_SRC_DIR=\\\"$$_PRO_FILE_PWD_/testapps\\\""
 DEFINES += "TESTRUNNER_APP_DIR=\\\"$(PWD)/testapps\\\""
diff --git a/tests/valgrind/valgrind.pro b/tests/auto/valgrind/valgrind.pro
index 08c400af2e..08c400af2e 100644
--- a/tests/valgrind/valgrind.pro
+++ b/tests/auto/valgrind/valgrind.pro