diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-26 15:54:34 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-10-26 15:54:34 +0200 |
| commit | 87fbe18ca58c96a17136e2bc62ccfafcc9cd4ed2 (patch) | |
| tree | 98dcb18081d3cd3f46938a6c9b06bc1a129027ce /src/lib/corelib/language/projectresolver.cpp | |
| parent | e46b1f09fca2af0782648d14cac401ec62ac46b4 (diff) | |
| parent | 783f2f91854d9c0a3cacca668d52ea761cc2a1b8 (diff) | |
Merge 1.12 into master
Change-Id: I5cf41522f027adac0889dc1df96613012216f092
Diffstat (limited to 'src/lib/corelib/language/projectresolver.cpp')
| -rw-r--r-- | src/lib/corelib/language/projectresolver.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/language/projectresolver.cpp b/src/lib/corelib/language/projectresolver.cpp index 92c92fd4b..4f871c17f 100644 --- a/src/lib/corelib/language/projectresolver.cpp +++ b/src/lib/corelib/language/projectresolver.cpp @@ -1696,6 +1696,8 @@ QVariantMap ProjectResolver::evaluateModuleValues(Item *item, bool lookupPrototy ? &m_elapsedTimeModPropEval : nullptr); QVariantMap moduleValues; for (const Item::Module &module : item->modules()) { + if (!module.item->isPresentModule()) + continue; const QString fullName = module.name.toString(); moduleValues[fullName] = evaluateProperties(module.item, lookupPrototype, true); } |