From d94ba7080d32050d7c5d12d9cf03ecb7b9b7ff46 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 27 Jul 2016 13:52:52 +0200 Subject: Separate file scope and imports scope When evaluating, imported names need to have a higher precedence than names in the item scope, as otherwise they can clash with dependencies of the product (see bug report and autotest). We cannot simply move the file scope's precedence up, because in addition to imports and the "file" and "filePath" properties, it also potentially contains ids from e.g. a module prototype, which would then override the respective entry in the module scope. Task-number: QBS-930 Change-Id: Ifb8b7c933225f872ccc3e878b2bf01b7b0ac0f99 Reviewed-by: Joerg Bornemann --- .../auto/blackbox/testdata/imports-conflict/modules/themodule/m.qbs | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 tests/auto/blackbox/testdata/imports-conflict/modules/themodule/m.qbs (limited to 'tests/auto/blackbox/testdata/imports-conflict/modules/themodule/m.qbs') diff --git a/tests/auto/blackbox/testdata/imports-conflict/modules/themodule/m.qbs b/tests/auto/blackbox/testdata/imports-conflict/modules/themodule/m.qbs new file mode 100644 index 000000000..48145d380 --- /dev/null +++ b/tests/auto/blackbox/testdata/imports-conflict/modules/themodule/m.qbs @@ -0,0 +1,5 @@ +import "utils.js" as Utils + +Module { + validate: { Utils.helper(); } +} -- cgit v1.2.3