diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-14 10:42:40 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-14 14:04:00 +0000 |
| commit | abd06c02a2ecb3ca7256ab02aaa7e037558ca615 (patch) | |
| tree | 741baac6a4a8aa83b205db80c46d13d77e90d09d /src/lib/corelib/language/projectresolver.cpp | |
| parent | 4514282237f36319b70ed03669a42c7e88371b89 (diff) | |
Fix using the prefixMapping property in a Properties item
This property must be skipped in the property declaration check as well
as for exporting purposes.
Change-Id: I250e1ef752c9bb288d5aecd455ef022dd304aa84
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/language/projectresolver.cpp')
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 7028e28ad..bbc7b544f 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -941,7 +941,7 @@ void ProjectResolver::setupExportedProperties(const Item *item, const QString &n for (auto it = props.cbegin(); it != props.cend(); ++it) { const QString qualifiedName = namePrefix.isEmpty() ? it.key() : namePrefix + QLatin1Char('.') + it.key(); - if (item->type() == ItemType::Export + if ((item->type() == ItemType::Export || item->type() == ItemType::Properties) && qualifiedName == StringConstants::prefixMappingProperty()) { continue; } |