diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-20 15:43:59 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-25 09:15:34 +0000 |
| commit | fbbd436bf1aea9522456f0a99196fa724b7c951c (patch) | |
| tree | 08dc269cd8fefef60051dc837da4ff3483e608c4 /src/lib/corelib/language/moduleloader.cpp | |
| parent | 10c7da071f1dcf2f3fcc7b1c970b3cff7f376a65 (diff) | |
Properly diagnose invalid module property assignments
... if the non-existing module name has more than one component. We
inadvertantly skipped the check in that case.
Task-number: QBS-1362
Change-Id: I1fcababee1ea70c3133bd1b1c8f8f32f8450a0e8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/language/moduleloader.cpp')
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 41781cb7d..567cf0aa0 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -430,12 +430,12 @@ private: if (!itemIsModuleInstance && value->item()->type() != ItemType::ModulePrefix - && m_parentItem->file() - && (!m_parentItem->file()->idScope() + && (!m_parentItem->file() || !m_parentItem->file()->idScope() || !m_parentItem->file()->idScope()->hasProperty(m_currentName)) && !value->createdByPropertiesBlock()) { const ErrorInfo error(Tr::tr("Item '%1' is not declared. " - "Did you forget to add a Depends item?").arg(m_currentName), + "Did you forget to add a Depends item?") + .arg(m_currentModuleName.toString()), value->location().isValid() ? value->location() : m_parentItem->location()); handlePropertyError(error, m_params, m_logger); |