Merge remote-tracking branch 'origin/4.5'

Change-Id: I86852d289c22210a0439e8e297819dc7276a96de
This commit is contained in:
Eike Ziller
2017-11-29 09:56:22 +01:00
17 changed files with 52 additions and 14 deletions

View File

@@ -202,7 +202,7 @@ FormatToken Scanner::readIdentifier()
// List of python built-in functions and objects
static const QSet<QString> builtins = {
"range", "xrange", "int", "float", "long", "hex", "oct" "chr", "ord",
"range", "xrange", "int", "float", "long", "hex", "oct", "chr", "ord",
"len", "abs", "None", "True", "False"
};