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

QmlJS: Fix static variable initialization

Browse Source 
You cannot use the variable itself in its initializer...

Change-Id: Ibaf64b717b0ad5523b4ef8cf20ce4bf967a64a43
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
This commit is contained in:
Orgad Shaneh
2016-09-22 09:46:52 +03:00
committed by Orgad Shaneh
parent c7b51f2ad3
commit 4c6c2032f6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/qmljs/qmljsscanner.cpp
View File

@@ -417,10 +417,11 @@ bool Scanner::isKeyword(const QString &text) const
QStringList Scanner::keywords() QStringList Scanner::keywords()
{ {
static QStringList words = [&]() { static QStringList words = []() {
QStringList res;
for (const QString *word = begin(js_keywords); word != end(js_keywords); ++word) for (const QString *word = begin(js_keywords); word != end(js_keywords); ++word)
words.append(*word); res.append(*word);
return words; return res;
}(); }();
return words; return words;
} }