feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmake: Run the test version of system()

Browse Source 
... 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>
This commit is contained in:
Christian Kandeler
2020-04-30 13:10:32 +02:00
parent 59473389b9
commit fcd6384f4d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/shared/proparser/qmakebuiltins.cpp
View File

@@ -1742,7 +1742,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
evalError(fL1S("system(exec) requires one argument.")); evalError(fL1S("system(exec) requires one argument."));
return ReturnFalse; return ReturnFalse;
} }
#ifdef PROEVALUATOR_FULL
if (m_cumulative) // Anything else would be insanity if (m_cumulative) // Anything else would be insanity
return ReturnFalse; return ReturnFalse;
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
@@ -1759,9 +1758,6 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
raise(WTERMSIG(ec)); raise(WTERMSIG(ec));
# endif # endif
return returnBool(ec == 0); return returnBool(ec == 0);
#endif
#else
return ReturnTrue;
#endif #endif
} }
case T_ISEMPTY: { case T_ISEMPTY: {