Autotests: Fix qbs build.

The semantic change in product.buildDirectory broke some autotests.

Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

6 files changed, 10 insertions, 8 deletions

diff --git a/tests/auto/debugger/dumpers.qbs b/tests/auto/debugger/dumpers.qbs
index 2ca6226fbc..e3f10b331c 100644
--- a/tests/auto/debugger/dumpers.qbs
+++ b/tests/auto/debugger/dumpers.qbs
@@ -26,7 +26,7 @@ QtcAutotest {
     }
 
     cpp.defines: base.concat([
-        'CDBEXT_PATH="' + buildDirectory + '\\\\lib"',
+        'CDBEXT_PATH="' + project.buildDirectory + '\\\\lib"',
         'DUMPERDIR="' + path + '/../../../share/qtcreator/debugger"',
         'QT_NO_CAST_FROM_ASCII',
         'QT_DISABLE_DEPRECATED_BEFORE=0x040900'
diff --git a/tests/auto/extensionsystem/plugin.qbs b/tests/auto/extensionsystem/plugin.qbs
index f7b99b7f7c..98c27e15c7 100644
--- a/tests/auto/extensionsystem/plugin.qbs
+++ b/tests/auto/extensionsystem/plugin.qbs
@@ -9,10 +9,11 @@ DynamicLibrary {
     Depends { name: "cpp" }
     Depends { name: "Qt.core" }
     targetName: QtcFunctions.qtLibraryName(qbs, name.split('_')[1])
-    destinationDirectory: FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
+    destinationDirectory: project.buildDirectory + '/'
+                          + FileInfo.relativePath(project.ide_source_tree, sourceDirectory)
     cpp.rpaths: [
-        buildDirectory + "/" + project.libDirName + "/qtcreator",
-        buildDirectory + "/" + project.libDirName + "/qtcreator/plugins"
+        project.buildDirectory + "/" + project.libDirName + "/qtcreator",
+        project.buildDirectory + "/" + project.libDirName + "/qtcreator/plugins"
     ].concat(additionalRPaths)
     property pathList filesToCopy
     property pathList additionalRPaths: []
diff --git a/tests/auto/valgrind/memcheck/modeldemo.qbs b/tests/auto/valgrind/memcheck/modeldemo.qbs
index c6a4a4ee45..a2f9c53890 100644
--- a/tests/auto/valgrind/memcheck/modeldemo.qbs
+++ b/tests/auto/valgrind/memcheck/modeldemo.qbs
@@ -8,6 +8,6 @@ ValgrindAutotest {
     files: ["modeldemo.h", "modeldemo.cpp"]
     cpp.defines: base.concat([
         'PARSERTESTS_DATA_DIR="' + path + '/data"',
-        'VALGRIND_FAKE_PATH="' + product.buildDirectory + '/' + project.ide_bin_path + '/valgrind-fake"'
+        'VALGRIND_FAKE_PATH="' + project.buildDirectory + '/' + project.ide_bin_path + '/valgrind-fake"'
     ])
 }
diff --git a/tests/auto/valgrind/memcheck/parsertests.qbs b/tests/auto/valgrind/memcheck/parsertests.qbs
index 3e0dabcdf4..60ced3f8d4 100644
--- a/tests/auto/valgrind/memcheck/parsertests.qbs
+++ b/tests/auto/valgrind/memcheck/parsertests.qbs
@@ -8,6 +8,6 @@ ValgrindAutotest {
     files: ["parsertests.h", "parsertests.cpp"]
     cpp.defines: base.concat([
         'PARSERTESTS_DATA_DIR="' + path + '/data"',
-        'VALGRIND_FAKE_PATH="' + product.buildDirectory + '/' + project.ide_bin_path + '/valgrind-fake"'
+        'VALGRIND_FAKE_PATH="' + project.buildDirectory + '/' + project.ide_bin_path + '/valgrind-fake"'
     ])
 }
diff --git a/tests/auto/valgrind/memcheck/testapps/testapp.qbs b/tests/auto/valgrind/memcheck/testapps/testapp.qbs
index f4ded88748..fa88860dff 100644
--- a/tests/auto/valgrind/memcheck/testapps/testapp.qbs
+++ b/tests/auto/valgrind/memcheck/testapps/testapp.qbs
@@ -5,6 +5,7 @@ QtcAutotest {
     name: "Memcheck " + testName + " autotest"
     property string testName
     targetName: testName // Test runner hardcodes the names of the executables
-    destinationDirectory: buildDirectory + '/' + project.ide_bin_path + '/testapps/' + testName
+    destinationDirectory: project.buildDirectory + '/'
+                          + project.ide_bin_path + '/testapps/' + testName
     files: "main.cpp"
 }
diff --git a/tests/auto/valgrind/memcheck/testrunner.qbs b/tests/auto/valgrind/memcheck/testrunner.qbs
index 686554b974..a274933bdf 100644
--- a/tests/auto/valgrind/memcheck/testrunner.qbs
+++ b/tests/auto/valgrind/memcheck/testrunner.qbs
@@ -19,6 +19,6 @@ ValgrindAutotest {
     destinationDirectory: project.ide_bin_path
     cpp.defines: base.concat([
         'TESTRUNNER_SRC_DIR="' + path + '/testapps"',
-        'TESTRUNNER_APP_DIR="' + product.buildDirectory + '/' + destinationDirectory + '/testapps"'
+        'TESTRUNNER_APP_DIR="' + project.buildDirectory + '/' + destinationDirectory + '/testapps"'
     ])
 }