Fix qbs project files for valgrind autotests.

They did not build on Windows.

Change-Id: I0c688b8e1b78e9bb06e2efd6e2cbf8791f272bc2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

6 files changed, 47 insertions, 26 deletions

diff --git a/tests/auto/valgrind/callgrind/callgrindparsertests.qbs b/tests/auto/valgrind/callgrind/callgrindparsertests.qbs
index 2fc51e896a..04fa145c26 100644
--- a/tests/auto/valgrind/callgrind/callgrindparsertests.qbs
+++ b/tests/auto/valgrind/callgrind/callgrindparsertests.qbs
@@ -1,14 +1,10 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import "../valgrindautotest.qbs" as ValgrindAutotest
 
-Autotest {
+ValgrindAutotest {
     name: "Callgrind parser autotest"
-    Depends { name: "QtcSsh" }
-    Depends { name: "Utils" }
-    Depends { name: "Valgrind" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
-    property path pluginDir: project.ide_source_tree + "/src/plugins/valgrind"
     files: ["callgrindparsertests.h", "callgrindparsertests.cpp"]
+
     cpp.defines: base.concat([
         'CALLGRINDPARSERTESTS',
         'PARSERTESTS_DATA_DIR="' + path + '/data"'
diff --git a/tests/auto/valgrind/memcheck/modeldemo.qbs b/tests/auto/valgrind/memcheck/modeldemo.qbs
index 0a520c5555..c6a4a4ee45 100644
--- a/tests/auto/valgrind/memcheck/modeldemo.qbs
+++ b/tests/auto/valgrind/memcheck/modeldemo.qbs
@@ -1,13 +1,9 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import "../valgrindautotest.qbs" as ValgrindAutotest
 
-Autotest {
+ValgrindAutotest {
     name: "Memcheck ModelDemo autotest"
-    Depends { name: "QtcSsh" }
-    Depends { name: "Utils" }
-    Depends { name: "Valgrind" }
     Depends { name: "valgrind-fake" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     Depends { name: "Qt.network" }
     files: ["modeldemo.h", "modeldemo.cpp"]
     cpp.defines: base.concat([
diff --git a/tests/auto/valgrind/memcheck/parsertests.qbs b/tests/auto/valgrind/memcheck/parsertests.qbs
index 509263c887..3e0dabcdf4 100644
--- a/tests/auto/valgrind/memcheck/parsertests.qbs
+++ b/tests/auto/valgrind/memcheck/parsertests.qbs
@@ -1,13 +1,9 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import "../valgrindautotest.qbs" as ValgrindAutotest
 
-Autotest {
+ValgrindAutotest {
     name: "Memcheck parser autotest"
-    Depends { name: "QtcSsh" }
-    Depends { name: "Utils" }
-    Depends { name: "Valgrind" }
     Depends { name: "valgrind-fake" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     Depends { name: "Qt.network" }
     files: ["parsertests.h", "parsertests.cpp"]
     cpp.defines: base.concat([
diff --git a/tests/auto/valgrind/memcheck/testrunner.qbs b/tests/auto/valgrind/memcheck/testrunner.qbs
index 12883429e7..686554b974 100644
--- a/tests/auto/valgrind/memcheck/testrunner.qbs
+++ b/tests/auto/valgrind/memcheck/testrunner.qbs
@@ -1,7 +1,7 @@
 import qbs
-import "../../autotest.qbs" as Autotest
+import "../valgrindautotest.qbs" as ValgrindAutotest
 
-Autotest {
+ValgrindAutotest {
     name: "Memcheck test runner"
     Depends { name: "Memcheck free1 autotest" }
     Depends { name: "Memcheck free2 autotest" }
@@ -15,10 +15,6 @@ Autotest {
     Depends { name: "Memcheck uninit1 autotest" }
     Depends { name: "Memcheck uninit2 autotest" }
     Depends { name: "Memcheck uninit3 autotest" }
-    Depends { name: "QtcSsh" }
-    Depends { name: "Utils" }
-    Depends { name: "Valgrind" }
-    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
     files: ["testrunner.h", "testrunner.cpp"]
     destinationDirectory: project.ide_bin_path
     cpp.defines: base.concat([
diff --git a/tests/auto/valgrind/valgrind.qbs b/tests/auto/valgrind/valgrind.qbs
index 3025b5bc2c..23b7e2cdbb 100644
--- a/tests/auto/valgrind/valgrind.qbs
+++ b/tests/auto/valgrind/valgrind.qbs
@@ -2,7 +2,6 @@ import qbs
 
 Project {
     name: "Valgrind autotests"
-    condition: qbs.targetOS.contains("unix") // FIXME: doesn't link on Windows
     references: [
         "callgrind/callgrind.qbs",
         "memcheck/memcheck.qbs"
diff --git a/tests/auto/valgrind/valgrindautotest.qbs b/tests/auto/valgrind/valgrindautotest.qbs
new file mode 100644
index 0000000000..0b0aee4d77
--- /dev/null
+++ b/tests/auto/valgrind/valgrindautotest.qbs
@@ -0,0 +1,38 @@
+import qbs
+import "../autotest.qbs" as Autotest
+
+Autotest {
+    Depends { name: "QtcSsh" }
+    Depends { name: "Utils" }
+    Depends { name: "Qt.widgets" } // TODO: Remove when qbs bug is fixed
+    property path pluginDir: project.ide_source_tree + "/src/plugins/valgrind"
+
+    Group {
+        name: "XML protocol files from plugin"
+        prefix: product.pluginDir + "/xmlprotocol/"
+        files: ["*.h", "*.cpp"]
+    }
+    Group {
+        name: "Callgrind files from plugin"
+        prefix: product.pluginDir + "/callgrind/"
+        files: ["*.h", "*.cpp"]
+    }
+    Group {
+        name: "Memcheck runner files from plugin"
+        prefix: product.pluginDir + "/memcheck/"
+        files: ["*.h", "*.cpp"]
+    }
+    Group {
+        name: "Other files from plugin"
+        prefix: product.pluginDir + "/"
+        files: [
+            "valgrindprocess.h", "valgrindprocess.cpp",
+            "valgrindrunner.h", "valgrindrunner.cpp",
+        ]
+    }
+
+    cpp.defines: base.concat([
+        'QT_DISABLE_DEPRECATED_BEFORE=0x040900',
+    ])
+    cpp.includePaths: base.concat([project.ide_source_tree + "/src/plugins"])
+}