diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-02-07 15:31:13 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-02-10 11:10:39 +0000 |
| commit | 6627cb2f3faa3b4dcec66e894c67d3fd2194c7c8 (patch) | |
| tree | 4efefba42034a3634386ebbea1ba1fb1a79eb496 /src/shared | |
| parent | b2ca5e49831681d3a7ddf9cd9863a65f1a2977cc (diff) | |
| download | qt-creator-6627cb2f3faa3b4dcec66e894c67d3fd2194c7c8.tar.gz | |
ProParser: Fix freeze with include loops
Make sure we exit also in inexact mode.
Fixes: QTCREATORBUG-23567
Change-Id: I5e933b9acba344fda7b7cc0ed21696b710860622
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/proparser/qmakeevaluator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/proparser/qmakeevaluator.cpp b/src/shared/proparser/qmakeevaluator.cpp index 6e75847eb9..062b7ffb6f 100644 --- a/src/shared/proparser/qmakeevaluator.cpp +++ b/src/shared/proparser/qmakeevaluator.cpp @@ -1954,7 +1954,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateFileChecked( for (const ProFile *pf : ref->m_profileStack) if (pf->fileName() == fileName) { evalError(fL1S("Circular inclusion of %1.").arg(fileName)); - return ReturnFalse; + return ReturnError; } } while ((ref = ref->m_caller)); return evaluateFile(fileName, type, flags); |