diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-24 15:16:37 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-07-28 08:52:45 +0000 |
| commit | 9ef620911514287ed7fd84604f2b8c95295fffe8 (patch) | |
| tree | bd6f9a57c4494d0cee8655661f83bf6d42bbf6d0 | |
| parent | f151e663ad2fcb554f1c8737724080c757f6108e (diff) | |
Don't advertise using relative paths in export items.
While we do support this for compatibility reasons, let's not encourage
it.
Change-Id: I4856b021b2e309e35974af68fe4dc10954d3d451
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | doc/reference/items/export.qdoc | 2 | ||||
| -rw-r--r-- | examples/app-and-lib/lib/lib.qbs | 2 | ||||
| -rw-r--r-- | qbs-resources/imports/QbsLibrary.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/api/testdata/dynamic-libs/link_dynamiclib.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/api/testdata/link-static-lib/project.qbs | 4 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/doc/reference/items/export.qdoc b/doc/reference/items/export.qdoc index 408a3720d..d41739496 100644 --- a/doc/reference/items/export.qdoc +++ b/doc/reference/items/export.qdoc @@ -47,7 +47,7 @@ name: "A" Export { Depends { name: "cpp" } - cpp.includePaths: "." + cpp.includePaths: product.sourceDirectory cpp.defines: ["USING_" + product.name.toUpperCase()] } } diff --git a/examples/app-and-lib/lib/lib.qbs b/examples/app-and-lib/lib/lib.qbs index e68335d1c..55417e0ef 100644 --- a/examples/app-and-lib/lib/lib.qbs +++ b/examples/app-and-lib/lib/lib.qbs @@ -49,7 +49,7 @@ Product { Export { Depends { name: "cpp" } - cpp.includePaths: ["."] + cpp.includePaths: [product.sourceDirectory] } } diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index 02c7fef66..4d05ea004 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -23,7 +23,7 @@ QbsProduct { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core"] } cpp.rpaths: project.libRPaths - cpp.includePaths: "." + cpp.includePaths: [product.sourceDirectory] cpp.defines: product.type === "staticlibrary" ? ["QBS_STATIC_LIB"] : [] } } diff --git a/tests/auto/api/testdata/dynamic-libs/link_dynamiclib.qbs b/tests/auto/api/testdata/dynamic-libs/link_dynamiclib.qbs index 0235234e2..fce0f8e43 100644 --- a/tests/auto/api/testdata/dynamic-libs/link_dynamiclib.qbs +++ b/tests/auto/api/testdata/dynamic-libs/link_dynamiclib.qbs @@ -59,7 +59,7 @@ Project { Export { Depends { name: "cpp" } - cpp.includePaths: ['.'] + cpp.includePaths: [product.sourceDirectory] } } } diff --git a/tests/auto/api/testdata/link-static-lib/project.qbs b/tests/auto/api/testdata/link-static-lib/project.qbs index 2ae327caa..6840a4cc6 100644 --- a/tests/auto/api/testdata/link-static-lib/project.qbs +++ b/tests/auto/api/testdata/link-static-lib/project.qbs @@ -27,7 +27,7 @@ Project { Depends { name: "helper2" } Export { Depends { name: "cpp" } - cpp.includePaths: ['helper1'] + cpp.includePaths: [product.sourceDirectory + '/helper1'] } } @@ -40,7 +40,7 @@ Project { Depends { name: "cpp" } Export { Depends { name: "cpp" } - cpp.includePaths: ['helper2'] + cpp.includePaths: [product.sourceDirectory + '/helper2'] } } } diff --git a/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs b/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs index 7f716996f..184ee13e3 100644 --- a/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs +++ b/tests/auto/blackbox/testdata/proper quoting/proper quoting.qbs @@ -34,7 +34,7 @@ Project { Depends { name: "cpp" } Export { Depends { name: "cpp" } - cpp.includePaths: ['some helper'] + cpp.includePaths: [product.sourceDirectory + '/some helper'] } } } |