aboutsummaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2012-10-21 09:39:50 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2012-10-22 12:50:38 +0200
commit5934e4b45a18153967b7ce82f3d8d430fe0e8e5c (patch)
tree5b10c69494034bf9b08d52472d51aaf417fa2b88 /tests/manual
parentb619f062d79a8a8aa8dc6327644b8e9689fd5bd2 (diff)
fix manual tests after dropping .qbp
After dropping the .qbp file extension we recommend to put base items intoa subdirectory. Otherwise one must specify the right .qbs file on build, if there are more than one .qbs files in a directory. Change-Id: Ia1a508bf4bb540e43e207bb1066527f5ed56254f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/baseProperties/imports/Bar.qbs (renamed from tests/manual/baseProperties/Bar.qbs)0
-rw-r--r--tests/manual/baseProperties/imports/Foo.qbs (renamed from tests/manual/baseProperties/Foo.qbs)0
-rw-r--r--tests/manual/baseProperties/prj.qbs1
-rw-r--r--tests/manual/inheritModuleSearchPath/imports/Foo.qbs (renamed from tests/manual/inheritModuleSearchPath/Foo.qbs)0
-rw-r--r--tests/manual/inheritModuleSearchPath/prj.qbs2
5 files changed, 2 insertions, 1 deletions
diff --git a/tests/manual/baseProperties/Bar.qbs b/tests/manual/baseProperties/imports/Bar.qbs
index c25541dc4..c25541dc4 100644
--- a/tests/manual/baseProperties/Bar.qbs
+++ b/tests/manual/baseProperties/imports/Bar.qbs
diff --git a/tests/manual/baseProperties/Foo.qbs b/tests/manual/baseProperties/imports/Foo.qbs
index d3da538dd..d3da538dd 100644
--- a/tests/manual/baseProperties/Foo.qbs
+++ b/tests/manual/baseProperties/imports/Foo.qbs
diff --git a/tests/manual/baseProperties/prj.qbs b/tests/manual/baseProperties/prj.qbs
index e7800da69..c202916d6 100644
--- a/tests/manual/baseProperties/prj.qbs
+++ b/tests/manual/baseProperties/prj.qbs
@@ -1,4 +1,5 @@
import qbs.base 1.0
+import "imports/Foo.qbs" as Foo
Project {
Foo {
diff --git a/tests/manual/inheritModuleSearchPath/Foo.qbs b/tests/manual/inheritModuleSearchPath/imports/Foo.qbs
index d52dabbc9..d52dabbc9 100644
--- a/tests/manual/inheritModuleSearchPath/Foo.qbs
+++ b/tests/manual/inheritModuleSearchPath/imports/Foo.qbs
diff --git a/tests/manual/inheritModuleSearchPath/prj.qbs b/tests/manual/inheritModuleSearchPath/prj.qbs
index 8f72cf5be..f3f341ff0 100644
--- a/tests/manual/inheritModuleSearchPath/prj.qbs
+++ b/tests/manual/inheritModuleSearchPath/prj.qbs
@@ -1,8 +1,8 @@
import qbs.base 1.0
+import "imports/Foo.qbs" as Foo
Project {
moduleSearchPaths: "subdir"
-// moduleSearchPaths: ["subdir"]
Foo {
files: "main.cpp"
}