valgrind: code cosmetics

Change-Id: I695c7d40aeb0b0b1e6f8cc0856e5fa5d9d1ce2d1
Reviewed-on: http://codereview.qt.nokia.com/1600
Reviewed-by: hjk <qthjk@ovi.com>

73 files changed, 153 insertions, 191 deletions

diff --git a/src/plugins/valgrind/callgrind/callgrind.pri b/src/plugins/valgrind/callgrind/callgrind.pri
new file mode 100644
index 0000000000..292f3a962f
--- /dev/null
+++ b/src/plugins/valgrind/callgrind/callgrind.pri
@@ -0,0 +1,35 @@
+QT *= network
+
+INCLUDEPATH *= $$PWD
+
+HEADERS += \
+    $$PWD/callgrindparser.h \
+    $$PWD/callgrindparsedata.h \
+    $$PWD/callgrindfunction.h \
+    $$PWD/callgrindfunction_p.h \
+    $$PWD/callgrindfunctioncycle.h \
+    $$PWD/callgrindfunctioncall.h \
+    $$PWD/callgrindcostitem.h \
+    $$PWD/callgrinddatamodel.h \
+    $$PWD/callgrindabstractmodel.h \
+    $$PWD/callgrindcallmodel.h \
+    $$PWD/callgrindcontroller.h \
+    $$PWD/callgrindcycledetection.h \
+    $$PWD/callgrindproxymodel.h \
+    $$PWD/callgrindstackbrowser.h \
+    $$PWD/callgrindrunner.h
+
+SOURCES += \ 
+    $$PWD/callgrindparser.cpp \
+    $$PWD/callgrindparsedata.cpp \
+    $$PWD/callgrindfunction.cpp \
+    $$PWD/callgrindfunctioncycle.cpp \
+    $$PWD/callgrindfunctioncall.cpp \
+    $$PWD/callgrindcostitem.cpp \
+    $$PWD/callgrinddatamodel.cpp \
+    $$PWD/callgrindcallmodel.cpp \
+    $$PWD/callgrindcontroller.cpp \
+    $$PWD/callgrindcycledetection.cpp \
+    $$PWD/callgrindproxymodel.cpp \
+    $$PWD/callgrindrunner.cpp \
+    $$PWD/callgrindstackbrowser.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindabstractmodel.h b/src/plugins/valgrind/callgrind/callgrindabstractmodel.h
index 90518e9a09..90518e9a09 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindabstractmodel.h
+++ b/src/plugins/valgrind/callgrind/callgrindabstractmodel.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindcallmodel.cpp b/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp
index d2be2c250c..d2be2c250c 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindcallmodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindcallmodel.h b/src/plugins/valgrind/callgrind/callgrindcallmodel.h
index 77bc69b850..77bc69b850 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindcallmodel.h
+++ b/src/plugins/valgrind/callgrind/callgrindcallmodel.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index c968cfa1de..c968cfa1de 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindcontroller.h b/src/plugins/valgrind/callgrind/callgrindcontroller.h
index 0368f5316f..0368f5316f 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindcontroller.h
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindcostitem.cpp b/src/plugins/valgrind/callgrind/callgrindcostitem.cpp
index a463ee75fa..a463ee75fa 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindcostitem.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcostitem.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindcostitem.h b/src/plugins/valgrind/callgrind/callgrindcostitem.h
index c0804606b0..c0804606b0 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindcostitem.h
+++ b/src/plugins/valgrind/callgrind/callgrindcostitem.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindcycledetection.cpp b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp
index 424bfa182b..424bfa182b 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindcycledetection.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindcycledetection.h b/src/plugins/valgrind/callgrind/callgrindcycledetection.h
index 1420145612..1420145612 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindcycledetection.h
+++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
index f72d6fae58..f72d6fae58 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrinddatamodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrinddatamodel.h b/src/plugins/valgrind/callgrind/callgrinddatamodel.h
index c155ef661c..c155ef661c 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrinddatamodel.h
+++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
index 49069c9cf2..49069c9cf2 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindfunction.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindfunction.h b/src/plugins/valgrind/callgrind/callgrindfunction.h
index 50a84b9218..50a84b9218 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindfunction.h
+++ b/src/plugins/valgrind/callgrind/callgrindfunction.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindfunction_p.h b/src/plugins/valgrind/callgrind/callgrindfunction_p.h
index b7fac85811..b7fac85811 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindfunction_p.h
+++ b/src/plugins/valgrind/callgrind/callgrindfunction_p.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindfunctioncall.cpp b/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp
index 69dbce2b7c..69dbce2b7c 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindfunctioncall.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindfunctioncall.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindfunctioncall.h b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h
index 2e825ebca3..2e825ebca3 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindfunctioncall.h
+++ b/src/plugins/valgrind/callgrind/callgrindfunctioncall.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindfunctioncycle.cpp b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp
index 952f6d48d9..952f6d48d9 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindfunctioncycle.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindfunctioncycle.h b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.h
index d4feaca2c0..d4feaca2c0 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindfunctioncycle.h
+++ b/src/plugins/valgrind/callgrind/callgrindfunctioncycle.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindparsedata.cpp b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
index 57f09d3701..57f09d3701 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindparsedata.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindparsedata.h b/src/plugins/valgrind/callgrind/callgrindparsedata.h
index a77f638f6f..a77f638f6f 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindparsedata.h
+++ b/src/plugins/valgrind/callgrind/callgrindparsedata.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp
index 50a6a4db3d..50a6a4db3d 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindparser.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindparser.h b/src/plugins/valgrind/callgrind/callgrindparser.h
index 40ee223524..40ee223524 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindparser.h
+++ b/src/plugins/valgrind/callgrind/callgrindparser.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindproxymodel.cpp b/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
index 44318ce406..44318ce406 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindproxymodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindproxymodel.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindproxymodel.h b/src/plugins/valgrind/callgrind/callgrindproxymodel.h
index c4c99e9e7f..c4c99e9e7f 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindproxymodel.h
+++ b/src/plugins/valgrind/callgrind/callgrindproxymodel.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindrunner.cpp b/src/plugins/valgrind/callgrind/callgrindrunner.cpp
index a42b825967..a42b825967 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindrunner.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindrunner.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindrunner.h b/src/plugins/valgrind/callgrind/callgrindrunner.h
index fb7da49db4..fb7da49db4 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindrunner.h
+++ b/src/plugins/valgrind/callgrind/callgrindrunner.h
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindstackbrowser.cpp b/src/plugins/valgrind/callgrind/callgrindstackbrowser.cpp
index b448b2f23d..b448b2f23d 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindstackbrowser.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindstackbrowser.cpp
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindstackbrowser.h b/src/plugins/valgrind/callgrind/callgrindstackbrowser.h
index a7b239ef4b..a7b239ef4b 100644
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindstackbrowser.h
+++ b/src/plugins/valgrind/callgrind/callgrindstackbrowser.h
diff --git a/src/plugins/valgrind/callgrindcostdelegate.cpp b/src/plugins/valgrind/callgrindcostdelegate.cpp
index b99da1ebc1..aed95bcabf 100644
--- a/src/plugins/valgrind/callgrindcostdelegate.cpp
+++ b/src/plugins/valgrind/callgrindcostdelegate.cpp
@@ -35,8 +35,8 @@
 #include "callgrindcostview.h"
 #include "callgrindhelper.h"
 
-#include <valgrind/callgrind/callgrindabstractmodel.h>
-#include <valgrind/callgrind/callgrindparsedata.h>
+#include "callgrind/callgrindabstractmodel.h"
+#include "callgrind/callgrindparsedata.h"
 
 #include <utils/qtcassert.h>
 
@@ -56,7 +56,6 @@ public:
     QAbstractItemModel *m_model;
     CostDelegate::CostFormat m_format;
 
-    static int toNativeRole(CostFormat format);
     float relativeCost(const QModelIndex &index) const;
     QString displayText(const QModelIndex &index, const QLocale &locale) const;
 };
@@ -66,15 +65,15 @@ CostDelegate::Private::Private()
     , m_format(CostDelegate::FormatAbsolute)
 {}
 
-int CostDelegate::Private::toNativeRole(CostDelegate::CostFormat format)
+static int toNativeRole(CostDelegate::CostFormat format)
 {
     switch (format)
     {
-    case FormatAbsolute:
-    case FormatRelative:
-        return Valgrind::Callgrind::RelativeTotalCostRole;
-    case FormatRelativeToParent:
-        return Valgrind::Callgrind::RelativeParentCostRole;
+    case CostDelegate::FormatAbsolute:
+    case CostDelegate::FormatRelative:
+        return Callgrind::RelativeTotalCostRole;
+    case CostDelegate::FormatRelativeToParent:
+        return Callgrind::RelativeParentCostRole;
     default:
         return -1;
     }
@@ -103,14 +102,10 @@ QString CostDelegate::Private::displayText(const QModelIndex &index, const QLoca
 
     return QString();
 }
-//END CostDelegate::Private
 
-//BEGIN CostDelegate
 CostDelegate::CostDelegate(QObject *parent)
-    : QStyledItemDelegate(parent)
-    , d(new Private)
+    : QStyledItemDelegate(parent), d(new Private)
 {
-
 }
 
 CostDelegate::~CostDelegate()
@@ -136,19 +131,18 @@ CostDelegate::CostFormat CostDelegate::format() const
 void CostDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
                          const QModelIndex &index) const
 {
-    // init
     QStyleOptionViewItemV4 opt(option);
     initStyleOption(&opt, index);
 
     QStyle *style = opt.widget ? opt.widget->style() : QApplication::style();
 
-    // draw controls, but no text
+    // Draw controls, but no text.
     opt.text.clear();
     style->drawControl(QStyle::CE_ItemViewItem, &opt, painter);
 
     painter->save();
 
-    // draw bar
+    // Draw bar.
     float ratio = qBound(0.0f, d->relativeCost(index), 1.0f);
     QRect barRect = opt.rect;
     barRect.setWidth(opt.rect.width() * ratio);
@@ -156,7 +150,7 @@ void CostDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
     painter->setBrush(CallgrindHelper::colorForCostRatio(ratio));
     painter->drawRect(barRect);
 
-    // draw text
+    // Draw text.
     const QString text = d->displayText(index, opt.locale);
     const QBrush &textBrush = (option.state & QStyle::State_Selected ? opt.palette.highlightedText() : opt.palette.text());
     painter->setBrush(Qt::NoBrush);
diff --git a/src/plugins/valgrind/callgrindnamedelegate.cpp b/src/plugins/valgrind/callgrindnamedelegate.cpp
index b59bc82c50..207f9db796 100644
--- a/src/plugins/valgrind/callgrindnamedelegate.cpp
+++ b/src/plugins/valgrind/callgrindnamedelegate.cpp
@@ -43,11 +43,6 @@ namespace Internal {
 NameDelegate::NameDelegate(QObject *parent)
     : QStyledItemDelegate(parent)
 {
-
-}
-
-NameDelegate::~NameDelegate()
-{
 }
 
 void NameDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
diff --git a/src/plugins/valgrind/callgrindnamedelegate.h b/src/plugins/valgrind/callgrindnamedelegate.h
index 719aa7422b..c61ee3c1d5 100644
--- a/src/plugins/valgrind/callgrindnamedelegate.h
+++ b/src/plugins/valgrind/callgrindnamedelegate.h
@@ -40,14 +40,11 @@ namespace Internal {
 
 class NameDelegate : public QStyledItemDelegate
 {
-    Q_OBJECT
-
 public:
     explicit NameDelegate(QObject *parent = 0);
-    virtual ~NameDelegate();
 
-    virtual void paint(QPainter *painter, const QStyleOptionViewItem &option,
-                       const QModelIndex &index) const;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+               const QModelIndex &index) const;
 };
 
 } // namespace Internal
diff --git a/src/plugins/valgrind/callgrindtextmark.cpp b/src/plugins/valgrind/callgrindtextmark.cpp
index fa2c4e8aa6..3baf2dcb9e 100644
--- a/src/plugins/valgrind/callgrindtextmark.cpp
+++ b/src/plugins/valgrind/callgrindtextmark.cpp
@@ -34,8 +34,8 @@
 
 #include "callgrindhelper.h"
 
-#include <valgrind/callgrind/callgrinddatamodel.h>
-#include <valgrind/callgrind/callgrindfunction.h>
+#include "callgrind/callgrinddatamodel.h"
+#include "callgrind/callgrindfunction.h"
 
 #include <QtCore/QDebug>
 #include <QtGui/QPainter>
diff --git a/src/plugins/valgrind/callgrindvisualisation.cpp b/src/plugins/valgrind/callgrindvisualisation.cpp
index adfb7f6f04..87928741c2 100644
--- a/src/plugins/valgrind/callgrindvisualisation.cpp
+++ b/src/plugins/valgrind/callgrindvisualisation.cpp
@@ -160,8 +160,7 @@ QRectF FunctionGraphicsTextItem::boundingRect() const
 }
 
 FunctionGraphicsItem::FunctionGraphicsItem(const QString &text,
-                                           qreal x, qreal y, qreal width,
-                                           qreal height, QGraphicsItem *parent)
+        qreal x, qreal y, qreal width, qreal height, QGraphicsItem *parent)
     : QGraphicsRectItem(x, y, width, height, parent)
     , m_text(0)
 {
@@ -180,8 +179,7 @@ FunctionGraphicsTextItem *FunctionGraphicsItem::textItem() const
 }
 
 void FunctionGraphicsItem::paint(QPainter *painter,
-                                 const QStyleOptionGraphicsItem *option,
-                                 QWidget *)
+    const QStyleOptionGraphicsItem *option, QWidget *)
 {
     painter->save();
 
diff --git a/src/plugins/valgrind/callgrindvisualisation.h b/src/plugins/valgrind/callgrindvisualisation.h
index ef3a08925e..f2fdd4d818 100644
--- a/src/plugins/valgrind/callgrindvisualisation.h
+++ b/src/plugins/valgrind/callgrindvisualisation.h
@@ -77,11 +77,10 @@ signals:
 protected slots:
     void populateScene();
 
-    virtual void mousePressEvent(QMouseEvent *event);
-    virtual void mouseDoubleClickEvent(QMouseEvent *event);
-
 protected:
-    virtual void resizeEvent(QResizeEvent *event);
+    void mousePressEvent(QMouseEvent *event);
+    void mouseDoubleClickEvent(QMouseEvent *event);
+    void resizeEvent(QResizeEvent *event);
 
 private:
     class Private;
diff --git a/src/plugins/valgrind/memcheck/memcheck.pri b/src/plugins/valgrind/memcheck/memcheck.pri
new file mode 100644
index 0000000000..facf1c4e11
--- /dev/null
+++ b/src/plugins/valgrind/memcheck/memcheck.pri
@@ -0,0 +1,9 @@
+QT *= network
+
+INCLUDEPATH *= $$PWD
+
+HEADERS += \
+    $$PWD/memcheckrunner.h 
+
+SOURCES += \
+    $$PWD/memcheckrunner.cpp 
diff --git a/src/plugins/valgrind/valgrind/memcheck/memcheckrunner.cpp b/src/plugins/valgrind/memcheck/memcheckrunner.cpp
index 2786451d93..2786451d93 100644
--- a/src/plugins/valgrind/valgrind/memcheck/memcheckrunner.cpp
+++ b/src/plugins/valgrind/memcheck/memcheckrunner.cpp
diff --git a/src/plugins/valgrind/valgrind/memcheck/memcheckrunner.h b/src/plugins/valgrind/memcheck/memcheckrunner.h
index 9fa5957061..9fa5957061 100644
--- a/src/plugins/valgrind/valgrind/memcheck/memcheckrunner.h
+++ b/src/plugins/valgrind/memcheck/memcheckrunner.h
diff --git a/src/plugins/valgrind/memcheckengine.cpp b/src/plugins/valgrind/memcheckengine.cpp
index 341b7a5470..19f20b8c00 100644
--- a/src/plugins/valgrind/memcheckengine.cpp
+++ b/src/plugins/valgrind/memcheckengine.cpp
@@ -62,7 +62,7 @@ MemcheckEngine::MemcheckEngine(IAnalyzerTool *tool, const AnalyzerStartParameter
     connect(&m_parser, SIGNAL(status(Valgrind::XmlProtocol::Status)),
             SLOT(status(Valgrind::XmlProtocol::Status)));
 
-    m_progress->setProgressRange(0, Valgrind::XmlProtocol::Status::Finished + 1);
+    m_progress->setProgressRange(0, XmlProtocol::Status::Finished + 1);
 }
 
 QString MemcheckEngine::progressTitle() const
diff --git a/src/plugins/valgrind/memcheckengine.h b/src/plugins/valgrind/memcheckengine.h
index 6fb21599db..22d00a181b 100644
--- a/src/plugins/valgrind/memcheckengine.h
+++ b/src/plugins/valgrind/memcheckengine.h
@@ -37,8 +37,8 @@
 
 #include "valgrindengine.h"
 
-#include <valgrind/memcheck/memcheckrunner.h>
-#include <valgrind/xmlprotocol/threadedparser.h>
+#include "memcheck/memcheckrunner.h"
+#include "xmlprotocol/threadedparser.h"
 
 namespace Valgrind {
 namespace Internal {
@@ -64,15 +64,15 @@ signals:
 protected:
     virtual QString progressTitle() const;
     virtual QStringList toolArguments() const;
-    virtual Valgrind::ValgrindRunner *runner();
+    virtual ValgrindRunner *runner();
 
 private slots:
     void receiveLogMessage(const QByteArray &);
     void status(const Valgrind::XmlProtocol::Status &status);
 
 private:
-    Valgrind::XmlProtocol::ThreadedParser m_parser;
-    Valgrind::Memcheck::MemcheckRunner m_runner;
+    XmlProtocol::ThreadedParser m_parser;
+    Memcheck::MemcheckRunner m_runner;
 };
 
 } // namespace Internal
diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp
index 69957dd6be..f044a7850b 100644
--- a/src/plugins/valgrind/memcheckerrorview.cpp
+++ b/src/plugins/valgrind/memcheckerrorview.cpp
@@ -37,12 +37,12 @@
 #include "suppressiondialog.h"
 #include "valgrindsettings.h"
 
-#include <valgrind/xmlprotocol/error.h>
-#include <valgrind/xmlprotocol/errorlistmodel.h>
-#include <valgrind/xmlprotocol/frame.h>
-#include <valgrind/xmlprotocol/stack.h>
-#include <valgrind/xmlprotocol/modelhelpers.h>
-#include <valgrind/xmlprotocol/suppression.h>
+#include "xmlprotocol/error.h"
+#include "xmlprotocol/errorlistmodel.h"
+#include "xmlprotocol/frame.h"
+#include "xmlprotocol/stack.h"
+#include "xmlprotocol/modelhelpers.h"
+#include "xmlprotocol/suppression.h"
 
 #include <texteditor/basetexteditor.h>
 
@@ -103,7 +103,7 @@ QSize MemcheckErrorDelegate::sizeHint(const QStyleOptionViewItem &opt, const QMo
                    m_detailsWidget->setParent(view->viewport()));
         m_detailsIndex = index;
     } else {
-        QTC_ASSERT(m_detailsIndex == index, qt_noop());
+        QTC_ASSERT(m_detailsIndex == index, /**/);
     }
     const int widthExcludingMargins = viewportWidth - 2 * s_itemMargin;
     m_detailsWidget->setFixedWidth(widthExcludingMargins);
@@ -230,7 +230,7 @@ QWidget *MemcheckErrorDelegate::createDetailsWidget(const QModelIndex &errorInde
         int frameNr = 1;
         foreach (const Frame &frame, stack.frames()) {
             QString frameName = makeFrameName(frame, relativeTo);
-            QTC_ASSERT(!frameName.isEmpty(), qt_noop());
+            QTC_ASSERT(!frameName.isEmpty(), /**/);
 
             QLabel *frameLabel = new QLabel(widget);
             frameLabel->setAutoFillBackground(true);
@@ -247,7 +247,7 @@ QWidget *MemcheckErrorDelegate::createDetailsWidget(const QModelIndex &errorInde
                                             .arg(frameNr++, 2).arg(frameName);
             frameLabel->setText(displayText);
 
-            frameLabel->setToolTip(Valgrind::XmlProtocol::toolTipForFrame(frame));
+            frameLabel->setToolTip(toolTipForFrame(frame));
             frameLabel->setWordWrap(true);
             frameLabel->setContentsMargins(0, 0, 0, 0);
             frameLabel->setMargin(0);
@@ -290,7 +290,7 @@ void MemcheckErrorDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 
     if (isSelected) {
         // only show detailed widget and let it handle everything
-        QTC_ASSERT(m_detailsIndex == index, qt_noop());
+        QTC_ASSERT(m_detailsIndex == index, /**/);
         QTC_ASSERT(m_detailsWidget, return); // should have been set in sizeHint()
         m_detailsWidget->move(pos);
         // when scrolling quickly, the widget can get stuck in a visible part of the scroll area
@@ -300,8 +300,8 @@ void MemcheckErrorDelegate::paint(QPainter *painter, const QStyleOptionViewItem
 
         const int viewportWidth = view->viewport()->width();
         const int widthExcludingMargins = viewportWidth - 2 * s_itemMargin;
-        QTC_ASSERT(m_detailsWidget->width() == widthExcludingMargins, qt_noop());
-        QTC_ASSERT(m_detailsWidgetHeight == m_detailsWidget->height(), qt_noop());
+        QTC_ASSERT(m_detailsWidget->width() == widthExcludingMargins, /**/);
+        QTC_ASSERT(m_detailsWidgetHeight == m_detailsWidget->height(), /**/);
     } else {
         // the reference coordinate for text drawing is the text baseline; move it inside the view rect.
         pos.ry() += fm.ascent();
diff --git a/src/plugins/valgrind/suppressiondialog.cpp b/src/plugins/valgrind/suppressiondialog.cpp
index 17d315109c..735fa5bf8d 100644
--- a/src/plugins/valgrind/suppressiondialog.cpp
+++ b/src/plugins/valgrind/suppressiondialog.cpp
@@ -38,6 +38,11 @@
 #include "memcheckerrorview.h"
 #include "memchecksettings.h"
 
+#include "xmlprotocol/suppression.h"
+#include "xmlprotocol/errorlistmodel.h"
+#include "xmlprotocol/stack.h"
+#include "xmlprotocol/frame.h"
+
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/project.h>
@@ -50,25 +55,20 @@
 #include <QtCore/QFile>
 #include <QtGui/QPushButton>
 
-#include <valgrind/xmlprotocol/suppression.h>
-#include <valgrind/xmlprotocol/errorlistmodel.h>
-#include <valgrind/xmlprotocol/stack.h>
-#include <valgrind/xmlprotocol/frame.h>
-
 using namespace Analyzer;
 using namespace Valgrind::XmlProtocol;
 
-namespace {
+namespace Valgrind {
+namespace Internal {
 
-QString suppressionText(const Error &error)
+static QString suppressionText(const Error &error)
 {
     Suppression sup(error.suppression());
 
     // workaround: https://bugs.kde.org/show_bug.cgi?id=255822
-    if (sup.frames().size() >= 24) {
+    if (sup.frames().size() >= 24)
         sup.setFrames(sup.frames().mid(0, 23));
-    }
-    QTC_ASSERT(sup.frames().size() < 24, qt_noop());
+    QTC_ASSERT(sup.frames().size() < 24, /**/)
 
     // try to set some useful name automatically, instead of "insert_name_here"
     // we take the last stack frame and append the suppression kind, e.g.:
@@ -82,9 +82,8 @@ QString suppressionText(const Error &error)
         else if (!frame.object().isEmpty())
             newName = frame.object();
 
-        if (!newName.isEmpty()) {
+        if (!newName.isEmpty())
             sup.setName(newName + '[' + sup.kind() + ']');
-        }
     }
 
     return sup.toString();
@@ -111,10 +110,9 @@ static bool equalSuppression(const Error &error, const Error &suppressed)
     if (suppressedFrames.size() < frames)
         frames = suppressedFrames.size();
 
-    for (int i = 0; i < frames; ++i) {
+    for (int i = 0; i < frames; ++i)
         if (errorFrames.at(i) != suppressedFrames.at(i))
             return false;
-    }
 
     return true;
 }
@@ -124,13 +122,8 @@ bool sortIndizesReverse(const QModelIndex &l, const QModelIndex &r)
     return l.row() > r.row();
 }
 
-} // namespace anoe
-
-namespace Valgrind {
-namespace Internal {
-
-SuppressionDialog::SuppressionDialog(MemcheckErrorView *view, QWidget *parent, Qt::WindowFlags f)
-  : QDialog(parent, f),
+SuppressionDialog::SuppressionDialog(MemcheckErrorView *view)
+  : QDialog(),
     m_view(view),
     m_ui(new Ui::SuppressionDialog),
     m_settings(view->settings()),
@@ -138,7 +131,7 @@ SuppressionDialog::SuppressionDialog(MemcheckErrorView *view, QWidget *parent, Q
 {
     m_ui->setupUi(this);
 
-    ///NOTE: pathchooser requires existing files...
+    // NOTE: pathchooser requires existing files.
     QFile defaultSuppFile(view->defaultSuppressionFile());
     if (!defaultSuppFile.exists()) {
         if (defaultSuppFile.open(QIODevice::WriteOnly)) {
@@ -147,7 +140,7 @@ SuppressionDialog::SuppressionDialog(MemcheckErrorView *view, QWidget *parent, Q
         }
     }
 
-    //NOTE: first set kind, then set path since otherwise the file will be seen as "invalid"
+    // NOTE: First set kind, then set path. Otherwise the file will be seen as "invalid".
     m_ui->fileChooser->setExpectedKind(Utils::PathChooser::File);
     m_ui->fileChooser->setPath(defaultSuppFile.fileName());
     m_ui->fileChooser->setPromptDialogFilter(QLatin1String("*.supp"));
@@ -158,15 +151,15 @@ SuppressionDialog::SuppressionDialog(MemcheckErrorView *view, QWidget *parent, Q
             SLOT(validate()));
 
     QString suppressions;
-    QModelIndexList indizes = m_view->selectionModel()->selectedRows();
-    if (indizes.isEmpty() && m_view->selectionModel()->currentIndex().isValid()) {
+    QModelIndexList indices = m_view->selectionModel()->selectedRows();
+    if (indices.isEmpty() && m_view->selectionModel()->currentIndex().isValid()) {
         // can happen when using arrow keys to navigate and shortcut to trigger suppression
-        indizes << m_view->selectionModel()->currentIndex();
+        indices.append(m_view->selectionModel()->currentIndex());
     }
-    foreach (const QModelIndex &index, indizes) {
+    foreach (const QModelIndex &index, indices) {
         Error error = m_view->model()->data(index, ErrorListModel::ErrorRole).value<Error>();
         if (!error.suppression().isNull())
-            m_errors << error;
+            m_errors.append(error);
     }
 
     foreach (const Error &error, m_errors)
@@ -208,9 +201,9 @@ void SuppressionDialog::accept()
 
     m_settings->subConfig<AbstractMemcheckSettings>()->addSuppressionFiles(QStringList(path));
 
-    QModelIndexList indizes = m_view->selectionModel()->selectedRows();
-    qSort(indizes.begin(), indizes.end(), sortIndizesReverse);
-    foreach (const QModelIndex &index, indizes) {
+    QModelIndexList indices = m_view->selectionModel()->selectedRows();
+    qSort(indices.begin(), indices.end(), sortIndizesReverse);
+    foreach (const QModelIndex &index, indices) {
         bool removed = m_view->model()->removeRow(index.row());
         QTC_ASSERT(removed, qt_noop());
         Q_UNUSED(removed);
@@ -234,7 +227,7 @@ void SuppressionDialog::accept()
     }
 
     // select a new item
-    m_view->setCurrentIndex(indizes.first());
+    m_view->setCurrentIndex(indices.first());
 
     QDialog::accept();
 }
diff --git a/src/plugins/valgrind/suppressiondialog.h b/src/plugins/valgrind/suppressiondialog.h
index 93fce056e6..3dc6ff7013 100644
--- a/src/plugins/valgrind/suppressiondialog.h
+++ b/src/plugins/valgrind/suppressiondialog.h
@@ -32,12 +32,12 @@
 **
 **************************************************************************/
 
-#ifndef ANALYZER_VALGRIND_INTERNAL_SUPPRESSIONDIALOG_H
-#define ANALYZER_VALGRIND_INTERNAL_SUPPRESSIONDIALOG_H
+#ifndef ANALYZER_VALGRIND_SUPPRESSIONDIALOG_H
+#define ANALYZER_VALGRIND_SUPPRESSIONDIALOG_H
 
-#include <QtGui/QDialog>
+#include "xmlprotocol/error.h"
 
-#include <valgrind/xmlprotocol/error.h>
+#include <QtGui/QDialog>
 
 namespace Analyzer {
 class AnalyzerSettings;
@@ -57,8 +57,8 @@ class SuppressionDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit SuppressionDialog(MemcheckErrorView *view, QWidget *parent = 0,
-                               Qt::WindowFlags f = 0);
+    SuppressionDialog(MemcheckErrorView *view);
+
     virtual void accept();
     virtual void reject();
 
@@ -72,10 +72,10 @@ private:
     Ui::SuppressionDialog *m_ui;
     Analyzer::AnalyzerSettings *m_settings;
     bool m_cleanupIfCanceled;
-    QList<Valgrind::XmlProtocol::Error> m_errors;
+    QList<XmlProtocol::Error> m_errors;
 };
 
 } // namespace Internal
 } // namespace Valgrind
 
-#endif // ANALYZER_VALGRIND_INTERNAL_SUPPRESSIONDIALOG_H
+#endif // ANALYZER_VALGRIND_SUPPRESSIONDIALOG_H
diff --git a/src/plugins/valgrind/valgrind.pro b/src/plugins/valgrind/valgrind.pro
index e07d06ee74..1be71c77b3 100644
--- a/src/plugins/valgrind/valgrind.pro
+++ b/src/plugins/valgrind/valgrind.pro
@@ -3,7 +3,9 @@ TARGET = Valgrind
 
 include(../../qtcreatorplugin.pri)
 include(valgrind_dependencies.pri)
-include(valgrind/valgrind.pri)
+include(callgrind/callgrind.pri)
+include(memcheck/memcheck.pri)
+include(xmlprotocol/xmlprotocol.pri)
 QT *= network
 
 INCLUDEPATH *= $$PWD
@@ -13,6 +15,9 @@ HEADERS += \
     valgrindengine.h \
     valgrindconfigwidget.h \
     valgrindsettings.h \
+    valgrindrunner.h \
+    valgrindprocess.h \
+    \
     callgrindconfigwidget.h \
     callgrindcostdelegate.h \
     callgrindcostview.h \
@@ -37,6 +42,8 @@ SOURCES += \
     valgrindengine.cpp \
     valgrindconfigwidget.cpp \
     valgrindsettings.cpp \
+    valgrindrunner.cpp \
+    valgrindprocess.cpp \
     \
     callgrindconfigwidget.cpp \
     callgrindcostdelegate.cpp \
diff --git a/src/plugins/valgrind/valgrind/callgrind/callgrindabstractmodel.cpp b/src/plugins/valgrind/valgrind/callgrind/callgrindabstractmodel.cpp
deleted file mode 100644
index 08f815034d..0000000000
--- a/src/plugins/valgrind/valgrind/callgrind/callgrindabstractmodel.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (info@qt.nokia.com)
-**
-**
-** GNU Lesser General Public License Usage
-**
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** Other Usage
-**
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at info@qt.nokia.com.
-**
-**************************************************************************/
diff --git a/src/plugins/valgrind/valgrind/valgrind.pri b/src/plugins/valgrind/valgrind/valgrind.pri
deleted file mode 100644
index 73cb4fcdbf..0000000000
--- a/src/plugins/valgrind/valgrind/valgrind.pri
+++ /dev/null
@@ -1,63 +0,0 @@
-QT *= network
-
-INCLUDEPATH *= $$PWD
-
-HEADERS += \
-    $$PWD/xmlprotocol/frame.h \
-    $$PWD/xmlprotocol/parser.h \
-    $$PWD/xmlprotocol/error.h \
-    $$PWD/xmlprotocol/status.h \
-    $$PWD/xmlprotocol/suppression.h \
-    $$PWD/xmlprotocol/threadedparser.h \
-    $$PWD/xmlprotocol/announcethread.h \
-    $$PWD/xmlprotocol/stack.h \
-    $$PWD/xmlprotocol/errorlistmodel.h \
-    $$PWD/xmlprotocol/stackmodel.h \
-    $$PWD/xmlprotocol/modelhelpers.h \
-    $$PWD/callgrind/callgrindparser.h \
-    $$PWD/callgrind/callgrindparsedata.h \
-    $$PWD/callgrind/callgrindfunction.h \
-    $$PWD/callgrind/callgrindfunction_p.h \
-    $$PWD/callgrind/callgrindfunctioncycle.h \
-    $$PWD/callgrind/callgrindfunctioncall.h \
-    $$PWD/callgrind/callgrindcostitem.h \
-    $$PWD/callgrind/callgrinddatamodel.h \
-    $$PWD/callgrind/callgrindabstractmodel.h \
-    $$PWD/callgrind/callgrindcallmodel.h \
-    $$PWD/callgrind/callgrindcontroller.h \
-    $$PWD/callgrind/callgrindcycledetection.h \
-    $$PWD/callgrind/callgrindproxymodel.h \
-    $$PWD/callgrind/callgrindstackbrowser.h \
-    $$PWD/callgrind/callgrindrunner.h \
-    $$PWD/memcheck/memcheckrunner.h \
-    $$PWD/valgrindrunner.h \
-    $$PWD/valgrindprocess.h
-
-SOURCES += $$PWD/xmlprotocol/error.cpp \
-    $$PWD/xmlprotocol/frame.cpp \
-    $$PWD/xmlprotocol/parser.cpp \
-    $$PWD/xmlprotocol/status.cpp \
-    $$PWD/xmlprotocol/suppression.cpp \
-    $$PWD/xmlprotocol/threadedparser.cpp \
-    $$PWD/xmlprotocol/announcethread.cpp \
-    $$PWD/xmlprotocol/stack.cpp \
-    $$PWD/xmlprotocol/errorlistmodel.cpp \
-    $$PWD/xmlprotocol/stackmodel.cpp \
-    $$PWD/xmlprotocol/modelhelpers.cpp \
-    $$PWD/callgrind/callgrindparser.cpp \
-    $$PWD/callgrind/callgrindparsedata.cpp \
-    $$PWD/callgrind/callgrindfunction.cpp \
-    $$PWD/callgrind/callgrindfunctioncycle.cpp \
-    $$PWD/callgrind/callgrindfunctioncall.cpp \
-    $$PWD/callgrind/callgrindcostitem.cpp \
-    $$PWD/callgrind/callgrindabstractmodel.cpp \
-    $$PWD/callgrind/callgrinddatamodel.cpp \
-    $$PWD/callgrind/callgrindcallmodel.cpp \
-    $$PWD/callgrind/callgrindcontroller.cpp \
-    $$PWD/callgrind/callgrindcycledetection.cpp \
-    $$PWD/callgrind/callgrindproxymodel.cpp \
-    $$PWD/callgrind/callgrindrunner.cpp \
-    $$PWD/callgrind/callgrindstackbrowser.cpp \
-    $$PWD/memcheck/memcheckrunner.cpp \
-    $$PWD/valgrindrunner.cpp \
-    $$PWD/valgrindprocess.cpp
diff --git a/src/plugins/valgrind/valgrind/valgrindprocess.cpp b/src/plugins/valgrind/valgrindprocess.cpp
index b2da5551f2..b2da5551f2 100644
--- a/src/plugins/valgrind/valgrind/valgrindprocess.cpp
+++ b/src/plugins/valgrind/valgrindprocess.cpp
diff --git a/src/plugins/valgrind/valgrind/valgrindprocess.h b/src/plugins/valgrind/valgrindprocess.h
index f4230bcd58..f4230bcd58 100644
--- a/src/plugins/valgrind/valgrind/valgrindprocess.h
+++ b/src/plugins/valgrind/valgrindprocess.h
diff --git a/src/plugins/valgrind/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp
index 8fdb69542e..8fdb69542e 100644
--- a/src/plugins/valgrind/valgrind/valgrindrunner.cpp
+++ b/src/plugins/valgrind/valgrindrunner.cpp
diff --git a/src/plugins/valgrind/valgrind/valgrindrunner.h b/src/plugins/valgrind/valgrindrunner.h
index 3b866dfc54..3b866dfc54 100644
--- a/src/plugins/valgrind/valgrind/valgrindrunner.h
+++ b/src/plugins/valgrind/valgrindrunner.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/announcethread.cpp b/src/plugins/valgrind/xmlprotocol/announcethread.cpp
index c4219652b0..c4219652b0 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/announcethread.cpp
+++ b/src/plugins/valgrind/xmlprotocol/announcethread.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/announcethread.h b/src/plugins/valgrind/xmlprotocol/announcethread.h
index 529e798d87..529e798d87 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/announcethread.h
+++ b/src/plugins/valgrind/xmlprotocol/announcethread.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/error.cpp b/src/plugins/valgrind/xmlprotocol/error.cpp
index 3742456142..3742456142 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/error.cpp
+++ b/src/plugins/valgrind/xmlprotocol/error.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/error.h b/src/plugins/valgrind/xmlprotocol/error.h
index 910098809d..910098809d 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/error.h
+++ b/src/plugins/valgrind/xmlprotocol/error.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/errorlistmodel.cpp b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
index 08794bd742..08794bd742 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/errorlistmodel.cpp
+++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/errorlistmodel.h b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h
index fe758ed01a..fe758ed01a 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/errorlistmodel.h
+++ b/src/plugins/valgrind/xmlprotocol/errorlistmodel.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/frame.cpp b/src/plugins/valgrind/xmlprotocol/frame.cpp
index 9b36a4a368..9b36a4a368 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/frame.cpp
+++ b/src/plugins/valgrind/xmlprotocol/frame.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/frame.h b/src/plugins/valgrind/xmlprotocol/frame.h
index e7b5cd649a..e7b5cd649a 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/frame.h
+++ b/src/plugins/valgrind/xmlprotocol/frame.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/modelhelpers.cpp b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp
index bb8151485b..bb8151485b 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/modelhelpers.cpp
+++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/modelhelpers.h b/src/plugins/valgrind/xmlprotocol/modelhelpers.h
index 6c2a57f155..6c2a57f155 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/modelhelpers.h
+++ b/src/plugins/valgrind/xmlprotocol/modelhelpers.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/parser.cpp b/src/plugins/valgrind/xmlprotocol/parser.cpp
index 6d602c9602..6d602c9602 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/parser.cpp
+++ b/src/plugins/valgrind/xmlprotocol/parser.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/parser.h b/src/plugins/valgrind/xmlprotocol/parser.h
index 0fed01dad9..0fed01dad9 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/parser.h
+++ b/src/plugins/valgrind/xmlprotocol/parser.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/stack.cpp b/src/plugins/valgrind/xmlprotocol/stack.cpp
index 8c2de28ff3..8c2de28ff3 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/stack.cpp
+++ b/src/plugins/valgrind/xmlprotocol/stack.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/stack.h b/src/plugins/valgrind/xmlprotocol/stack.h
index 72330007f1..72330007f1 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/stack.h
+++ b/src/plugins/valgrind/xmlprotocol/stack.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/stackmodel.cpp b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp
index ef20cd940a..ef20cd940a 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/stackmodel.cpp
+++ b/src/plugins/valgrind/xmlprotocol/stackmodel.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/stackmodel.h b/src/plugins/valgrind/xmlprotocol/stackmodel.h
index df6574fcd0..df6574fcd0 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/stackmodel.h
+++ b/src/plugins/valgrind/xmlprotocol/stackmodel.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/status.cpp b/src/plugins/valgrind/xmlprotocol/status.cpp
index 2991dd3d2f..2991dd3d2f 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/status.cpp
+++ b/src/plugins/valgrind/xmlprotocol/status.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/status.h b/src/plugins/valgrind/xmlprotocol/status.h
index 1c1089d0e9..1c1089d0e9 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/status.h
+++ b/src/plugins/valgrind/xmlprotocol/status.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/suppression.cpp b/src/plugins/valgrind/xmlprotocol/suppression.cpp
index 3720c41999..3720c41999 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/suppression.cpp
+++ b/src/plugins/valgrind/xmlprotocol/suppression.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/suppression.h b/src/plugins/valgrind/xmlprotocol/suppression.h
index 82d781ff76..82d781ff76 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/suppression.h
+++ b/src/plugins/valgrind/xmlprotocol/suppression.h
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/threadedparser.cpp b/src/plugins/valgrind/xmlprotocol/threadedparser.cpp
index 29968356af..29968356af 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/threadedparser.cpp
+++ b/src/plugins/valgrind/xmlprotocol/threadedparser.cpp
diff --git a/src/plugins/valgrind/valgrind/xmlprotocol/threadedparser.h b/src/plugins/valgrind/xmlprotocol/threadedparser.h
index 49d6d11509..49d6d11509 100644
--- a/src/plugins/valgrind/valgrind/xmlprotocol/threadedparser.h
+++ b/src/plugins/valgrind/xmlprotocol/threadedparser.h
diff --git a/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri b/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri
new file mode 100644
index 0000000000..fe3fda438f
--- /dev/null
+++ b/src/plugins/valgrind/xmlprotocol/xmlprotocol.pri
@@ -0,0 +1,29 @@
+QT *= network
+
+INCLUDEPATH *= $$PWD
+
+HEADERS += \
+    $$PWD/frame.h \
+    $$PWD/parser.h \
+    $$PWD/error.h \
+    $$PWD/status.h \
+    $$PWD/suppression.h \
+    $$PWD/threadedparser.h \
+    $$PWD/announcethread.h \
+    $$PWD/stack.h \
+    $$PWD/errorlistmodel.h \
+    $$PWD/stackmodel.h \
+    $$PWD/modelhelpers.h
+
+SOURCES += \
+    $$PWD/error.cpp \
+    $$PWD/frame.cpp \
+    $$PWD/parser.cpp \
+    $$PWD/status.cpp \
+    $$PWD/suppression.cpp \
+    $$PWD/threadedparser.cpp \
+    $$PWD/announcethread.cpp \
+    $$PWD/stack.cpp \
+    $$PWD/errorlistmodel.cpp \
+    $$PWD/stackmodel.cpp \
+    $$PWD/modelhelpers.cpp