Fix Valgrind test compilation.

Change-Id: I13dfc18d1b283af610edba4f40515aef01001d92
Reviewed-on: http://codereview.qt.nokia.com/2781
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bill King <bill.king@nokia.com>

7 files changed, 23 insertions, 22 deletions

diff --git a/tests/valgrind/callgrind/callgrind.pro b/tests/valgrind/callgrind/callgrind.pro
index f40c53ccbf..c48d1f43a5 100644
--- a/tests/valgrind/callgrind/callgrind.pro
+++ b/tests/valgrind/callgrind/callgrind.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 
-SUBDIRS += callgrindparsertests.pro modeltest.pro
+SUBDIRS += callgrindparsertests.pro
+# modeltest.pro not compiling due to missing widget handler.
diff --git a/tests/valgrind/callgrind/callgrindparsertests.pro b/tests/valgrind/callgrind/callgrindparsertests.pro
index 6ecbcc633c..39b25046c4 100644
--- a/tests/valgrind/callgrind/callgrindparsertests.pro
+++ b/tests/valgrind/callgrind/callgrindparsertests.pro
@@ -1,5 +1,5 @@
 include(../../auto/qttest.pri)
-include(../../../src/libs/valgrind/valgrind.pri)
+include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 TARGET = callgrindparsertests
 
diff --git a/tests/valgrind/callgrind/modeltest.cpp b/tests/valgrind/callgrind/modeltest.cpp
index 77cf91df7e..65c483f322 100644
--- a/tests/valgrind/callgrind/modeltest.cpp
+++ b/tests/valgrind/callgrind/modeltest.cpp
@@ -51,10 +51,9 @@
 #include <QtGui/QDockWidget>
 #include <QtGui/QToolButton>
 
-#include <callgrind/callgrindcostview.h>
-#include <callgrind/callgrindcostdelegate.h>
-#include <callgrind/callgrindvisualisation.h>
-#include <callgrind/callgrindwidgethandler.h>
+#include <callgrindcostview.h>
+#include <callgrindcostdelegate.h>
+#include <callgrindvisualisation.h>
 
 #include <valgrind/callgrind/callgrindparsedata.h>
 #include <valgrind/callgrind/callgrindparser.h>
diff --git a/tests/valgrind/callgrind/modeltest.pro b/tests/valgrind/callgrind/modeltest.pro
index 0038639ec0..ef70530633 100644
--- a/tests/valgrind/callgrind/modeltest.pro
+++ b/tests/valgrind/callgrind/modeltest.pro
@@ -1,6 +1,6 @@
 include(../../../qtcreator.pri)
 include(../../auto/qttestrpath.pri)
-include($$IDE_SOURCE_TREE/src/plugins/callgrind/callgrind.pri)
+include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
 include($$IDE_SOURCE_TREE/src/libs/languageutils/languageutils.pri)
 
 TEMPLATE = app
@@ -13,21 +13,21 @@ SRCDIR = $$IDE_SOURCE_TREE/src
 
 SOURCES += \
     modeltest.cpp \
-    $$SRCDIR/plugins/callgrind/callgrindcostdelegate.cpp \
-    $$SRCDIR/plugins/callgrind/callgrindhelper.cpp \
-    $$SRCDIR/plugins/callgrind/callgrindcostview.cpp \
-    $$SRCDIR/plugins/callgrind/callgrindnamedelegate.cpp \
-    $$SRCDIR/plugins/callgrind/callgrindwidgethandler.cpp \
-    $$SRCDIR/plugins/callgrind/callgrindvisualisation.cpp \
+    $$SRCDIR/plugins/valgrind/callgrindcostdelegate.cpp \
+    $$SRCDIR/plugins/valgrind/callgrindhelper.cpp \
+    $$SRCDIR/plugins/valgrind/callgrindcostview.cpp \
+    $$SRCDIR/plugins/valgrind/callgrindnamedelegate.cpp \
+    $$SRCDIR/plugins/valgrind/callgrindwidgethandler.cpp \
+    $$SRCDIR/plugins/valgrind/callgrindvisualisation.cpp \
 
 HEADERS += \
     modeltest.h \
-    $$SRCDIR/plugins/callgrind/callgrindcostdelegate.h \
-    $$SRCDIR/plugins/callgrind/callgrindcostview.h \
-    $$SRCDIR/plugins/callgrind/callgrindhelper.h \
-    $$SRCDIR/plugins/callgrind/callgrindnamedelegate.h \
-    $$SRCDIR/plugins/callgrind/callgrindwidgethandler.h \
-    $$SRCDIR/plugins/callgrind/callgrindvisualisation.h \
+    $$SRCDIR/plugins/valgrind/callgrindcostdelegate.h \
+    $$SRCDIR/plugins/valgrind/callgrindcostview.h \
+    $$SRCDIR/plugins/valgrind/callgrindhelper.h \
+    $$SRCDIR/plugins/valgrind/callgrindnamedelegate.h \
+    $$SRCDIR/plugins/valgrind/callgrindwidgethandler.h \
+    $$SRCDIR/plugins/valgrind/callgrindvisualisation.h \
 
 LIBS += -L$$IDE_PLUGIN_PATH/Nokia
 
diff --git a/tests/valgrind/memcheck/modeldemo.pro b/tests/valgrind/memcheck/modeldemo.pro
index 1034124234..e002f36542 100644
--- a/tests/valgrind/memcheck/modeldemo.pro
+++ b/tests/valgrind/memcheck/modeldemo.pro
@@ -2,7 +2,8 @@ include(../../../qtcreator.pri)
 include(../../auto/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/valgrind/valgrind.pri)
+include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
+
 TEMPLATE = app
 TARGET = modeldemo
 
diff --git a/tests/valgrind/memcheck/parsertests.pro b/tests/valgrind/memcheck/parsertests.pro
index 6338951f48..3170210d38 100644
--- a/tests/valgrind/memcheck/parsertests.pro
+++ b/tests/valgrind/memcheck/parsertests.pro
@@ -1,7 +1,7 @@
 include(../../auto/qttest.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/valgrind/valgrind.pri)
+include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
 
 TARGET = parsertests
 
diff --git a/tests/valgrind/memcheck/testrunner.pro b/tests/valgrind/memcheck/testrunner.pro
index f83c439412..53035bbac7 100644
--- a/tests/valgrind/memcheck/testrunner.pro
+++ b/tests/valgrind/memcheck/testrunner.pro
@@ -1,7 +1,7 @@
 include(../../auto/qttest.pri)
 include($$IDE_SOURCE_TREE/src/libs/utils/utils.pri)
 include($$IDE_SOURCE_TREE/src/libs/3rdparty/botan/botan.pri)
-include($$IDE_SOURCE_TREE/src/libs/valgrind/valgrind.pri)
+include($$IDE_SOURCE_TREE/src/plugins/valgrind/valgrind_test.pri)
 
 TARGET = testrunner