Loader: Emit a proper error when binding to module properties

... in Project items. This can only happen for the pseudo-qbs module that we load for Project items. Fixes: QBS-1752 Change-Id: I34fae59e14bcd2d3c06aedcf43d5c93583a3a5de Reviewed-by: Ivan Komissarov <[email protected]>
hicknhack-software · Oct 18, 2023 · b239b3a · b239b3a
1 parent cb0e12a
commit b239b3a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/src/lib/corelib/loader/modulepropertymerger.cpp b/src/lib/corelib/loader/modulepropertymerger.cpp
@@ -176,6 +176,11 @@ void ModulePropertyMerger::mergePropertyFromLocalInstance(
     Item *loadingItem, const QString &loadingName, Item *globalInstance,
     const QString &name, const ValuePtr &value)
 {
+    if (loadingItem->type() == ItemType::Project) {
+        throw ErrorInfo(Tr::tr("Module properties cannot be set in Project items."),
+                        value->location());
+    }
+
     const PropertyDeclaration decl = globalInstance->propertyDeclaration(name);
     if (!decl.isValid()) {
         if (value->type() == Value::ItemValueType || value->createdByPropertiesBlock())

diff --git a/tests/auto/language/testdata/erroneous/module-property-binding-in-project.qbs b/tests/auto/language/testdata/erroneous/module-property-binding-in-project.qbs
@@ -0,0 +1,3 @@
+Project {
+    qbs.sysroot: "/"
+}
diff --git a/tests/auto/language/tst_language.cpp b/tests/auto/language/tst_language.cpp
@@ -1019,6 +1019,8 @@ void TestLanguage::erroneousFiles_data()
             << "missing-js-file-module.qbs.*Cannot open '.*javascriptfile.js'";
     QTest::newRow("frozen-object") << "'key' is read-only";
     QTest::newRow("frozen-object-list") << "object is not extensible";
+    QTest::newRow("module-property-binding-in-project")
+        << "Module properties cannot be set in Project items";
 }
 
 void TestLanguage::erroneousFiles()