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/jsruntime/qv4profiling_p.h | |
| 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/jsruntime/qv4profiling_p.h')
| -rw-r--r-- | src/qml/jsruntime/qv4profiling_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4profiling_p.h b/src/qml/jsruntime/qv4profiling_p.h index 66227fe733..8461384e9a 100644 --- a/src/qml/jsruntime/qv4profiling_p.h +++ b/src/qml/jsruntime/qv4profiling_p.h @@ -139,7 +139,7 @@ struct MemoryAllocationProperties { class FunctionCall { public: - FunctionCall() : m_function(0), m_start(0), m_end(0) + FunctionCall() : m_function(nullptr), m_start(0), m_end(0) { Q_ASSERT_X(false, Q_FUNC_INFO, "Cannot construct a function call without function"); } FunctionCall(Function *function, qint64 start, qint64 end) : @@ -276,7 +276,7 @@ public: // It's enough to ref() the function in the destructor as it will probably not disappear while // it's executing ... FunctionCallProfiler(ExecutionEngine *engine, Function *f) - : profiler(0) + : profiler(nullptr) { Profiler *p = engine->profiler(); if (Q_UNLIKELY(p) && (p->featuresEnabled & (1 << Profiling::FeatureFunctionCall))) { |