summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-10-10 16:14:19 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-10-10 16:40:30 +0200
commit64a2ada5d5e3567c9a9438bf355df245a5f72fdf (patch)
tree910c70a9faa5769464b2fd6a02c345613a622984 /tests
parent26e36605ef7af968b287972ee97ec073c6fee421 (diff)
downloadqbs-64a2ada5d5e3567c9a9438bf355df245a5f72fdf.tar.gz
Update tests to use "qbsSearchPaths" property.
Change-Id: Ie790bfdd4ffb9ae937383553c40f730434879d1a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/blackbox/testdata/exportWithRecursiveDepends/project.qbs2
-rw-r--r--tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/modules/module1/module1.qbs (renamed from tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/module1/module1.qbs)0
-rw-r--r--tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/modules/module2/module2.qbs (renamed from tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/module2/module2.qbs)0
-rw-r--r--tests/manual/configure/configure.qbs2
-rw-r--r--tests/manual/includeLookup/includeLookup.qbs2
-rw-r--r--tests/manual/inheritModuleSearchPath/prj.qbs2
-rw-r--r--tests/manual/inheritModuleSearchPath/subdir/modules/bli/m.qbs (renamed from tests/manual/inheritModuleSearchPath/subdir/bli/m.qbs)0
7 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/blackbox/testdata/exportWithRecursiveDepends/project.qbs b/tests/auto/blackbox/testdata/exportWithRecursiveDepends/project.qbs
index 0e554b808..045e65133 100644
--- a/tests/auto/blackbox/testdata/exportWithRecursiveDepends/project.qbs
+++ b/tests/auto/blackbox/testdata/exportWithRecursiveDepends/project.qbs
@@ -12,5 +12,5 @@ Project {
Depends { name: "app1" }
files: "main2.cpp"
}
- moduleSearchPaths: "qbs"
+ qbsSearchPaths: "qbs"
}
diff --git a/tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/module1/module1.qbs b/tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/modules/module1/module1.qbs
index c1c4ad358..c1c4ad358 100644
--- a/tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/module1/module1.qbs
+++ b/tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/modules/module1/module1.qbs
diff --git a/tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/module2/module2.qbs b/tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/modules/module2/module2.qbs
index 75a274631..75a274631 100644
--- a/tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/module2/module2.qbs
+++ b/tests/auto/blackbox/testdata/exportWithRecursiveDepends/qbs/modules/module2/module2.qbs
diff --git a/tests/manual/configure/configure.qbs b/tests/manual/configure/configure.qbs
index e70d36a0b..acb257a3e 100644
--- a/tests/manual/configure/configure.qbs
+++ b/tests/manual/configure/configure.qbs
@@ -3,7 +3,7 @@ import qbs.FileInfo
Project {
property string name: 'configure'
- moduleSearchPaths: 'modules'
+ qbsSearchPaths: '.'
Product {
type: 'application'
name: project.name
diff --git a/tests/manual/includeLookup/includeLookup.qbs b/tests/manual/includeLookup/includeLookup.qbs
index a01afcdeb..61af93ade 100644
--- a/tests/manual/includeLookup/includeLookup.qbs
+++ b/tests/manual/includeLookup/includeLookup.qbs
@@ -3,7 +3,7 @@ import qbs.FileInfo
Project {
property string name: 'includeLookup'
- moduleSearchPaths: 'modules'
+ qbsSearchPaths: '.'
Product {
type: 'application'
name: project.name
diff --git a/tests/manual/inheritModuleSearchPath/prj.qbs b/tests/manual/inheritModuleSearchPath/prj.qbs
index 0f5164f47..ba8284f4f 100644
--- a/tests/manual/inheritModuleSearchPath/prj.qbs
+++ b/tests/manual/inheritModuleSearchPath/prj.qbs
@@ -2,7 +2,7 @@ import qbs 1.0
import "imports/Foo.qbs" as Foo
Project {
- moduleSearchPaths: "subdir"
+ qbsSearchPaths: "subdir"
Foo {
files: "main.cpp"
}
diff --git a/tests/manual/inheritModuleSearchPath/subdir/bli/m.qbs b/tests/manual/inheritModuleSearchPath/subdir/modules/bli/m.qbs
index b4b93678a..b4b93678a 100644
--- a/tests/manual/inheritModuleSearchPath/subdir/bli/m.qbs
+++ b/tests/manual/inheritModuleSearchPath/subdir/modules/bli/m.qbs