Merge remote-tracking branch 'origin/3.1'

src/plugins/qmlprofiler/qml/Overview.qml

@@ -98,6 +98,8 @@ Canvas {
     onPaint: {
         if (context === null)
             return; // canvas isn't ready
+
+        context.reset();
         Plotter.qmlProfilerModelProxy = qmlProfilerModelProxy;
         if (dataReady) {
             Plotter.plot(canvas, context, region);

src/plugins/qmlprofiler/qml/TimeDisplay.qml

@@ -50,6 +50,8 @@ Canvas {
     onPaint: {
         if (context === null)
             return; // canvas isn't ready
+
+        context.reset();
         context.fillStyle = "white";
         context.fillRect(0, 0, width, height);
 

src/plugins/qmlprofiler/qml/TimeMarks.qml

@@ -49,6 +49,8 @@ Canvas {
     onPaint: {
         if (context === null)
             return; // canvas isn't ready
+
+        context.reset();
         drawBackgroundBars( context, region );
 
         var totalTime = endTime - startTime;

src/plugins/qmlprofiler/qmlprofilerpainteventsmodelproxy.cpp

@@ -74,7 +74,7 @@ PaintEventsModelProxy::PaintEventsModelProxy(QObject *parent)
 void PaintEventsModelProxy::clear()
 {
     Q_D(PaintEventsModelProxy);
-    d->SortedTimelineModel::clear();
+    d->clear();
     d->maxGuiThreadAnimations = d->maxRenderThreadAnimations = 0;
     d->expanded = false;
     d->seenForeignPaintEvent = false;

src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp

@@ -80,7 +80,7 @@ BasicTimelineModel::BasicTimelineModel(QObject *parent)
 void BasicTimelineModel::clear()
 {
     Q_D(BasicTimelineModel);
-    d->SortedTimelineModel::clear();
+    d->clear();
     d->eventDict.clear();
     d->eventHashes.clear();
     d->categorySpan.clear();