diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-20 21:30:05 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-02-20 21:30:05 +0100 |
| commit | 759cdce3e6d22995106cfec0f1e6c6cbd3fdf266 (patch) | |
| tree | 0786bd9d91492a784859578b136de9abc1dbba45 /src/qml/debugger | |
| parent | ee6ab05bba3622adcaf1787947b239659b8ac241 (diff) | |
| parent | 15416b1ffc6ce83a11bfe5d05e97ecdc45d3411c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7b98beb61f73a74b80cf80a49b63819aa6eb528e
Diffstat (limited to 'src/qml/debugger')
| -rw-r--r-- | src/qml/debugger/qqmlprofiler_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h index a326bfc4ad..c1038d2f76 100644 --- a/src/qml/debugger/qqmlprofiler_p.h +++ b/src/qml/debugger/qqmlprofiler_p.h @@ -521,11 +521,11 @@ private: QQmlProfiler *profiler; }; -#endif // QT_NO_QML_DEBUGGER +#endif // QT_CONFIG(qml_debug) QT_END_NAMESPACE -#ifndef QT_NO_QML_DEBUGGER +#if QT_CONFIG(qml_debug) Q_DECLARE_METATYPE(QVector<QQmlProfilerData>) Q_DECLARE_METATYPE(QQmlProfiler::LocationHash) |