Merge remote-tracking branch 'origin/2.5'

Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp

Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d

src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp

@@ -42,6 +42,7 @@ namespace Internal {
 
 QmlProfilerCanvas::QmlProfilerCanvas()
     : m_context2d(new Context2D(this))
+    , m_dirty(true)
 {
     setFlag(QGraphicsItem::ItemHasNoContents, false);
     setAcceptedMouseButtons(Qt::LeftButton);

src/plugins/qmlprofiler/qmlprofilereventview.cpp

@@ -393,6 +393,7 @@ QmlProfilerEventsMainView::~QmlProfilerEventsMainView()
 {
     clear();
     delete d->m_model;
+    delete d;
 }
 
 void QmlProfilerEventsMainView::profilerDataModelStateChanged()