diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-27 08:43:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-27 08:43:10 +0100 |
| commit | bb7a5d0cb6e62fa411e8b66759bf6b798c3f68d9 (patch) | |
| tree | 06c325dc386afd26281ba0ebdbf4fd3f56f892b0 /src/qml/parser/qqmljsengine_p.cpp | |
| parent | 41edb3bd9f373a865d5698ac8c18bf341071eae9 (diff) | |
| parent | e41d067227eb6225b05df88ab724708588fa5304 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4internalclass.cpp
src/qml/parser/qqmljslexer.cpp
src/qml/qml/v8/qv8engine.cpp
src/qml/util/qqmladaptormodel_p.h
src/quick/items/qquickanimatedsprite.cpp
tests/auto/quick/qquickanimatedsprite/tst_qquickanimatedsprite.cpp
Change-Id: I16702b7a0da29c2a332afee47728d6a6ebf4fb3f
Diffstat (limited to 'src/qml/parser/qqmljsengine_p.cpp')
| -rw-r--r-- | src/qml/parser/qqmljsengine_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/parser/qqmljsengine_p.cpp b/src/qml/parser/qqmljsengine_p.cpp index 5b105bc60c..97ce6ebea3 100644 --- a/src/qml/parser/qqmljsengine_p.cpp +++ b/src/qml/parser/qqmljsengine_p.cpp @@ -113,7 +113,7 @@ double integerFromString(const char *buf, int size, int radix) } Engine::Engine() - : _lexer(0), _directives(0) + : _lexer(nullptr), _directives(nullptr) { } Engine::~Engine() |