From 2ce7959eb9e69cd68013fc6a0f77a9556a84365b Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Thu, 16 Jan 2014 13:18:05 +0100 Subject: Further pack messages for QQmlProfilerService Allow multiple detailTypes in each packet and extend the profiling code to make use of that. Note that this changes the usual order of pixmapSizeKnown and PixmapLoadingFinished events. As far as I can see this doesn't affect the QML profiler frontend and the order of these events isn't specified anywhere. Change-Id: Id39ad98594ccf35add4415e08daf9e92ab561237 Reviewed-by: Simon Hausmann --- src/quick/items/qquickview.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/quick/items/qquickview.cpp') diff --git a/src/quick/items/qquickview.cpp b/src/quick/items/qquickview.cpp index f78ba3520c..1a3d225995 100644 --- a/src/quick/items/qquickview.cpp +++ b/src/quick/items/qquickview.cpp @@ -603,7 +603,7 @@ void QQuickView::resizeEvent(QResizeEvent *e) /*! \reimp */ void QQuickView::keyPressEvent(QKeyEvent *e) { - Q_QML_PROFILE(addEvent(QQmlProfilerService::Key)); + Q_QML_PROFILE(addEvent()); QQuickWindow::keyPressEvent(e); } @@ -611,7 +611,7 @@ void QQuickView::keyPressEvent(QKeyEvent *e) /*! \reimp */ void QQuickView::keyReleaseEvent(QKeyEvent *e) { - Q_QML_PROFILE(addEvent(QQmlProfilerService::Key)); + Q_QML_PROFILE(addEvent()); QQuickWindow::keyReleaseEvent(e); } @@ -619,7 +619,7 @@ void QQuickView::keyReleaseEvent(QKeyEvent *e) /*! \reimp */ void QQuickView::mouseMoveEvent(QMouseEvent *e) { - Q_QML_PROFILE(addEvent(QQmlProfilerService::Mouse)); + Q_QML_PROFILE(addEvent()); QQuickWindow::mouseMoveEvent(e); } @@ -627,7 +627,7 @@ void QQuickView::mouseMoveEvent(QMouseEvent *e) /*! \reimp */ void QQuickView::mousePressEvent(QMouseEvent *e) { - Q_QML_PROFILE(addEvent(QQmlProfilerService::Mouse)); + Q_QML_PROFILE(addEvent()); QQuickWindow::mousePressEvent(e); } @@ -635,7 +635,7 @@ void QQuickView::mousePressEvent(QMouseEvent *e) /*! \reimp */ void QQuickView::mouseReleaseEvent(QMouseEvent *e) { - Q_QML_PROFILE(addEvent(QQmlProfilerService::Mouse)); + Q_QML_PROFILE(addEvent()); QQuickWindow::mouseReleaseEvent(e); } -- cgit v1.2.3