diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-30 13:10:32 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-04-30 12:33:40 +0000 |
| commit | fcd6384f4d5dc48ab24ee0e897af9ef760924e92 (patch) | |
| tree | fa5557191f76847132533efc5d7f6f3d773ead97 /src/shared | |
| parent | 59473389b90b7f311c72bd90a16a8813181a226f (diff) | |
qmake: Run the test version of system()
... also when PROEVALUATOR_FULL is not defined.
For more correct parsing. We do not believe that this introduces
additional risk, because the replace version of system() has always been
enabled, and appears to be used more often.
Fixes: QTCREATORBUG-23940
Change-Id: I036a20fdab3f6c51c612912b60686a123440f397
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/shared')
| -rw-r--r-- | src/shared/proparser/qmakebuiltins.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/shared/proparser/qmakebuiltins.cpp b/src/shared/proparser/qmakebuiltins.cpp index f7d2a43038..e55e212644 100644 --- a/src/shared/proparser/qmakebuiltins.cpp +++ b/src/shared/proparser/qmakebuiltins.cpp @@ -1742,7 +1742,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( evalError(fL1S("system(exec) requires one argument.")); return ReturnFalse; } -#ifdef PROEVALUATOR_FULL if (m_cumulative) // Anything else would be insanity return ReturnFalse; #ifndef QT_BOOTSTRAPPED @@ -1760,9 +1759,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional( # endif return returnBool(ec == 0); #endif -#else - return ReturnTrue; -#endif } case T_ISEMPTY: { if (args.count() != 1) { |