diff options
| -rw-r--r-- | changelogs/changes-1.10.1.md | 1 | ||||
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/changelogs/changes-1.10.1.md b/changelogs/changes-1.10.1.md index d3be09e65..d0f68a898 100644 --- a/changelogs/changes-1.10.1.md +++ b/changelogs/changes-1.10.1.md @@ -8,3 +8,4 @@ * Fix access to module instances in dependency parameters (QBS-1253). * Fix race condition when creating Inno Setup, NSIS, or WiX installers. * Fix release builds for Android with NDK r12 and above (QBS-1256). +* Fix parametrized dependencies in Export and Module items (QBS-1287). diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 1feac1be1..f2dae2cf9 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -2274,7 +2274,8 @@ static QVariantMap safeToVariant(const QScriptValue &v) QVariantMap ModuleLoader::extractParameters(Item *dependsItem) const { QVariantMap result; - const Item::PropertyMap &itemProperties = filterItemProperties(dependsItem->properties()); + const Item::PropertyMap &itemProperties = filterItemProperties( + rootPrototype(dependsItem)->properties()); if (itemProperties.isEmpty()) return result; diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index fdccf7467..c952f2bff 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -2371,13 +2371,14 @@ void TestBlackbox::pluginDependency() QVERIFY(m_qbsStdout.contains("plugin3")); QVERIFY(m_qbsStdout.contains("plugin4")); QVERIFY(m_qbsStdout.contains("helper2")); + QEXPECT_FAIL("", "FIXME", Continue); + QVERIFY(!m_qbsStderr.contains("SOFT ASSERT")); // Build the app. Plugins 1 and 2 must not be linked. Plugin 3 must be linked. QCOMPARE(runQbs(QStringList{"--command-echo-mode", "command-line"}), 0); QByteArray output = m_qbsStdout + '\n' + m_qbsStderr; QVERIFY(!output.contains("plugin1")); QVERIFY(!output.contains("plugin2")); - QEXPECT_FAIL("", "QBS-1287", Continue); QVERIFY(!output.contains("helper2")); // Check that the build dependency still works. |