PropertyDeclarationCheck: Do not skip Subproject items.

Otherwise, potentially large parts of a project will go unchecked.

Change-Id: I61b2622ae1c3e249836d75a72cd3a8145ba5ebb2
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

3 files changed, 9 insertions, 2 deletions

diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp
index 367e186be..552deb24e 100644
--- a/src/lib/corelib/language/moduleloader.cpp
+++ b/src/lib/corelib/language/moduleloader.cpp
@@ -208,7 +208,9 @@ private:
     {
         if (m_disabledItems.contains(item)
                 || item->typeName() == QLatin1String("Export")
-                || item->typeName() == QLatin1String("SubProject")) {
+
+                // The Properties child of a SubProject item is not a regular item.
+                || item->typeName() == QLatin1String("Properties")) {
             return;
         }
 
diff --git a/src/lib/corelib/language/testdata/erroneous/undeclared_property_wrapper.qbs b/src/lib/corelib/language/testdata/erroneous/undeclared_property_wrapper.qbs
new file mode 100644
index 000000000..ee263ef7f
--- /dev/null
+++ b/src/lib/corelib/language/testdata/erroneous/undeclared_property_wrapper.qbs
@@ -0,0 +1,5 @@
+import qbs
+
+SubProject {
+    filePath: "undeclared_property.qbs"
+}
diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp
index 78b5f31ef..4cfad8b83 100644
--- a/src/lib/corelib/language/tst_language.cpp
+++ b/src/lib/corelib/language/tst_language.cpp
@@ -466,7 +466,7 @@ void TestLanguage::erroneousFiles_data()
             << "Array element at index 1 is undefined. String expected.";
     QTest::newRow("undeclared_item")
             << "Item 'cpp' is not declared.";
-    QTest::newRow("undeclared_property")
+    QTest::newRow("undeclared_property_wrapper")
             << "Property 'doesntexist' is not declared.";
     QTest::newRow("unknown_item_type")
             << "Unexpected item type 'Narf'";