diff options
| -rw-r--r-- | src/lib/language/moduleloader.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/language/moduleloader.cpp b/src/lib/language/moduleloader.cpp index 40ce8a95f..9c97271b6 100644 --- a/src/lib/language/moduleloader.cpp +++ b/src/lib/language/moduleloader.cpp @@ -1096,6 +1096,10 @@ void ModuleLoader::overrideItemProperties(Item *item, const QString &buildConfig for (QVariantMap::const_iterator it = overridden.constBegin(); it != overridden.constEnd(); ++it) { const PropertyDeclaration decl = item->propertyDeclarations().value(it.key()); + if (!decl.isValid()) { + throw ErrorInfo( + Tr::tr("Unknown property: %1.%2").arg(buildConfigKey, it.key())); + } item->setProperty(it.key(), VariantValue::create(convertToPropertyType(it.value(), decl.type, QStringList(buildConfigKey), it.key()))); diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index 6cd7d608c..a60d4795e 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -201,7 +201,6 @@ void TestApi::nonexistingProjectPropertyFromCommandLine() QScopedPointer<qbs::SetupProjectJob> job(qbs::Project::setupProject(setupParams, m_logSink, 0)); waitForFinished(job.data()); - QEXPECT_FAIL("", "QBS-431", Abort); QVERIFY(job->error().hasError()); QVERIFY2(job->error().toString().contains(QLatin1String("blubb")), qPrintable(job->error().toString())); |