diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-09-25 11:55:20 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-09-27 09:04:52 +0000 |
| commit | 960bebd61f70c39e2fbce9f67b889cd64f48cea7 (patch) | |
| tree | a85d303859d532b57e1b9350755481c1eca7df0c /src | |
| parent | 4f956e914a2cfbb3cb440a3b67498f1b3cda8094 (diff) | |
QQmlTypeLoader: The profiler is a quintptr(0) if QT_NO_QML_DEBUGGING
This follows the pattern established in other places.
Task-number: QTBUG-63392
Change-Id: I11cd66d5552f751804dd0a9460b26bda546c1726
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index c214f0cd43..abc0df9068 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -322,8 +322,8 @@ public: void invalidate(); #ifdef QT_NO_QML_DEBUGGER - QQmlProfiler *profiler() const { return nullptr; } - void setProfiler(QQmlProfiler *) {} + quintptr profiler() const { return 0; } + void setProfiler(quintptr) {} #else QQmlProfiler *profiler() const { return m_profiler.data(); } void setProfiler(QQmlProfiler *profiler); |