diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:27:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-06 19:30:25 +0200 |
| commit | 0af2998cc99e90e3df34f794801340d8a769c735 (patch) | |
| tree | 61e40f82c8ebf6e843f691c085644aa65180247d /src/qml/qml/qqmltypeloader_p.h | |
| parent | f07f1e399d5e13671f2f2ef4c55b1e6a1bc37e3b (diff) | |
| parent | 32218c3243fb4f0da83293c5bd6a663d8e3660ee (diff) | |
Merge remote-tracking branch 'origin/5.9.2' into 5.9
Change-Id: Iddce38c1d6cb51e7cccedaff165e21b60d7a85b2
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
| -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); |