diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-22 16:32:05 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-23 07:23:23 +0000 |
| commit | ed5dd866cd83c74df5d2d22660b8f1d695218e1b (patch) | |
| tree | f925dc6b405094c45ac87cc3c58b66548fbe2280 /src/lib | |
| parent | ffca2303fee02c52415aa01cf8ea658c06649ebc (diff) | |
Fix convenience command-line override syntax for qbs properties
Users can write "qbs.xyz" instead of "modules.qbs.xyz", but we only
applied that during module prototype loading, meaning that using that
syntax (and only that syntax) would not override values set in project
files, which was obviously quite confusing to users.
Now the two variants behave exactly the same.
Task-number: QBS-1244
Change-Id: Ie9c5de1ac42e33205b80335566e0721d61718947
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 4341a9787..e7d2dfdec 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -2725,6 +2725,8 @@ void ModuleLoader::instantiateModule(ProductContext *productContext, Item *expor + QLatin1Char('.') + fullName; for (Item *instance = moduleInstance; instance; instance = instance->prototype()) { overrideItemProperties(instance, generalOverrideKey, m_parameters.overriddenValuesTree()); + if (fullName == QStringLiteral("qbs")) + overrideItemProperties(instance, fullName, m_parameters.overriddenValuesTree()); overrideItemProperties(instance, perProductOverrideKey, m_parameters.overriddenValuesTree()); if (instance == deepestModuleInstance) |