Commit a4e4c44a authored by Oswald Buddenhagen's avatar Oswald Buddenhagen
Browse files

re-entrancy: $$list() counter cannot be static

parent cfa6203e
...@@ -296,6 +296,7 @@ public: ...@@ -296,6 +296,7 @@ public:
QHash<const ProFile*, QHash<QString, QStringList> > m_filevaluemap; // Variables per include file QHash<const ProFile*, QHash<QString, QStringList> > m_filevaluemap; // Variables per include file
QString m_outputDir; QString m_outputDir;
int m_listCount;
bool m_definingTest; bool m_definingTest;
QString m_definingFunc; QString m_definingFunc;
FunctionDefs m_functionDefs; FunctionDefs m_functionDefs;
...@@ -330,6 +331,7 @@ ProFileEvaluator::Private::Private(ProFileEvaluator *q_, ProFileOption *option) ...@@ -330,6 +331,7 @@ ProFileEvaluator::Private::Private(ProFileEvaluator *q_, ProFileOption *option)
m_invertNext = false; m_invertNext = false;
m_skipLevel = 0; m_skipLevel = 0;
m_definingFunc.clear(); m_definingFunc.clear();
m_listCount = 0;
} }
ProFileEvaluator::Private::~Private() ProFileEvaluator::Private::~Private()
...@@ -1951,9 +1953,8 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun ...@@ -1951,9 +1953,8 @@ QStringList ProFileEvaluator::Private::evaluateExpandFunction(const QString &fun
} }
break; break;
case E_LIST: { case E_LIST: {
static int x = 0;
QString tmp; QString tmp;
tmp.sprintf(".QMAKE_INTERNAL_TMP_variableName_%d", x++); tmp.sprintf(".QMAKE_INTERNAL_TMP_variableName_%d", m_listCount++);
ret = QStringList(tmp); ret = QStringList(tmp);
QStringList lst; QStringList lst;
foreach (const QString &arg, args) foreach (const QString &arg, args)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment