feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.3'

Browse Source
This commit is contained in:
Eike Ziller
2014-12-01 15:44:30 +01:00
parent 34a48645c5 d93afdeda5
commit d341c48246
55 changed files with 699 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprofiler/qml/CategoryLabel.qml
View File

@@ -98,7 +98,7 @@ Item {
id: dragArea
anchors.fill: txt
drag.target: dragger
cursorShape: dragging ? Qt.DragMoveCursor : Qt.OpenHandCursor
cursorShape: dragging ? Qt.ClosedHandCursor : Qt.OpenHandCursor
}
DropArea {

2
src/plugins/qmlprofiler/timelinerenderer.cpp
View File

@@ -371,6 +371,8 @@ void TimelineRenderer::drawNotes(QPainter *p)
if (managerIndex == -1)
continue;
int modelIndex = m_profilerModelProxy->modelIndexFromManagerIndex(managerIndex);
if (m_profilerModelProxy->hidden(modelIndex))
continue;
int eventIndex = notes->timelineIndex(i);
int row = m_profilerModelProxy->row(modelIndex, eventIndex);
int rowHeight = m_profilerModelProxy->rowHeight(modelIndex, row);