diff --git a/src/plugins/qmlprofiler/timelinemodel.cpp b/src/plugins/qmlprofiler/timelinemodel.cpp index 335f25e0c7b..e094b5ab696 100644 --- a/src/plugins/qmlprofiler/timelinemodel.cpp +++ b/src/plugins/qmlprofiler/timelinemodel.cpp @@ -140,7 +140,7 @@ TimelineModel::TimelineModelPrivate::TimelineModelPrivate(int modelId, const QSt void TimelineModel::TimelineModelPrivate::init(TimelineModel *q) { q_ptr = q; - connect(q,SIGNAL(rowHeightChanged()),q,SIGNAL(heightChanged())); + connect(q,SIGNAL(rowHeightChanged(int,int)),q,SIGNAL(heightChanged())); connect(q,SIGNAL(expandedChanged()),q,SIGNAL(heightChanged())); connect(q,SIGNAL(hiddenChanged()),q,SIGNAL(heightChanged())); connect(q,SIGNAL(emptyChanged()),q,SIGNAL(heightChanged())); @@ -217,10 +217,10 @@ void TimelineModel::setRowHeight(int rowNumber, int height) int difference = height - d->rowOffsets[rowNumber] + (rowNumber > 0 ? d->rowOffsets[rowNumber - 1] : 0); if (difference != 0) { - for (; rowNumber < d->rowOffsets.size(); ++rowNumber) { - d->rowOffsets[rowNumber] += difference; + for (int offsetRow = rowNumber; offsetRow < d->rowOffsets.size(); ++offsetRow) { + d->rowOffsets[offsetRow] += difference; } - emit rowHeightChanged(); + emit rowHeightChanged(rowNumber, height); } } @@ -511,7 +511,7 @@ void TimelineModel::clear() d->ranges.clear(); d->endTimes.clear(); if (hadRowHeights) - emit rowHeightChanged(); + emit rowHeightChanged(-1, -1); if (wasExpanded) emit expandedChanged(); if (wasHidden) diff --git a/src/plugins/qmlprofiler/timelinemodel.h b/src/plugins/qmlprofiler/timelinemodel.h index 0fd25f22d32..4c57b3d93c0 100644 --- a/src/plugins/qmlprofiler/timelinemodel.h +++ b/src/plugins/qmlprofiler/timelinemodel.h @@ -110,7 +110,7 @@ public: signals: void expandedChanged(); void hiddenChanged(); - void rowHeightChanged(); + void rowHeightChanged(int row, int height); void emptyChanged(); void heightChanged(); void rowCountChanged(); diff --git a/src/plugins/qmlprofiler/timelinerenderer.cpp b/src/plugins/qmlprofiler/timelinerenderer.cpp index 707cc428111..833ec6780f8 100644 --- a/src/plugins/qmlprofiler/timelinerenderer.cpp +++ b/src/plugins/qmlprofiler/timelinerenderer.cpp @@ -66,14 +66,14 @@ void TimelineRenderer::setModel(QmlProfilerTimelineModel *model) if (m_model) { disconnect(m_model, SIGNAL(expandedChanged()), this, SLOT(requestPaint())); disconnect(m_model, SIGNAL(hiddenChanged()), this, SLOT(requestPaint())); - disconnect(m_model, SIGNAL(rowHeightChanged()), this, SLOT(requestPaint())); + disconnect(m_model, SIGNAL(rowHeightChanged(int,int)), this, SLOT(requestPaint())); } m_model = model; if (m_model) { connect(m_model, SIGNAL(expandedChanged()), this, SLOT(requestPaint())); connect(m_model, SIGNAL(hiddenChanged()), this, SLOT(requestPaint())); - connect(m_model, SIGNAL(rowHeightChanged()), this, SLOT(requestPaint())); + connect(m_model, SIGNAL(rowHeightChanged(int,int)), this, SLOT(requestPaint())); } emit modelChanged(m_model);