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

Fix QmlProfiler when built with Qt 6.6

Browse Source 
qrc:/qt/qml/QtCreator/Tracing/TimelineLabels.qml:29:5: Cannot override
FINAL property
         property bool dragging: false
         ^

Flickable has a `dragging` property itself, and in Qt 6.6 that leads to
this error.

Fixes: QTCREATORBUG-29719
Change-Id: I882e944035141622c0bdf65ee4fcb3cf145aef0d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Eike Ziller
2023-10-09 10:53:57 +02:00
parent d4e7dfca76
commit 3b516524e3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/tracing/qml/CategoryLabel.qml
View File

@@ -15,7 +15,7 @@ Item {
property bool expanded: model && model.expanded property bool expanded: model && model.expanded
property var labels: (expanded && model) ? model.labels : [] property var labels: (expanded && model) ? model.labels : []
property bool dragging property bool isDragging
property int visualIndex property int visualIndex
property int dragOffset property int dragOffset
property Item draggerParent property Item draggerParent
@@ -38,10 +38,10 @@ Item {
id: dragArea id: dragArea
anchors.fill: txt anchors.fill: txt
drag.target: dragger drag.target: dragger
cursorShape: labelContainer.dragging ? Qt.ClosedHandCursor : Qt.OpenHandCursor cursorShape: labelContainer.isDragging ? Qt.ClosedHandCursor : Qt.OpenHandCursor
// Account for parent change below // Account for parent change below
drag.minimumY: labelContainer.dragging ? 0 : -labelContainer.dragOffset drag.minimumY: labelContainer.isDragging ? 0 : -labelContainer.dragOffset
drag.maximumY: labelContainer.visibleHeight - (labelContainer.dragging ? 0 : labelContainer.dragOffset) drag.maximumY: labelContainer.visibleHeight - (labelContainer.isDragging ? 0 : labelContainer.dragOffset)
drag.axis: Drag.YAxis drag.axis: Drag.YAxis
hoverEnabled: true hoverEnabled: true
ToolTip { ToolTip {
@@ -221,7 +221,7 @@ Item {
MouseArea { MouseArea {
anchors.top: dragArea.bottom anchors.top: dragArea.bottom
anchors.bottom: labelContainer.dragging ? labelContainer.bottom : dragArea.bottom anchors.bottom: labelContainer.isDragging ? labelContainer.bottom : dragArea.bottom
anchors.left: labelContainer.left anchors.left: labelContainer.left
anchors.right: labelContainer.right anchors.right: labelContainer.right
cursorShape: dragArea.cursorShape cursorShape: dragArea.cursorShape

8
src/libs/tracing/qml/TimelineLabels.qml
View File

@@ -26,7 +26,7 @@ Flickable {
// Dispatch the cursor shape to all labels. When dragging the DropArea receiving // Dispatch the cursor shape to all labels. When dragging the DropArea receiving
// the drag events is not necessarily related to the MouseArea receiving the mouse // the drag events is not necessarily related to the MouseArea receiving the mouse
// events, so we can't use the drag events to determine the cursor shape. // events, so we can't use the drag events to determine the cursor shape.
property bool dragging: false property bool isDragging: false
Column { Column {
id: categoryContent id: categoryContent
@@ -75,10 +75,10 @@ Flickable {
model: modelData model: modelData
notesModel: categories.modelProxy.notes notesModel: categories.modelProxy.notes
visualIndex: loader.visualIndex visualIndex: loader.visualIndex
dragging: categories.dragging isDragging: categories.isDragging
reverseSelect: categories.reverseSelect reverseSelect: categories.reverseSelect
onDragStarted: categories.dragging = true onDragStarted: categories.isDragging = true
onDragStopped: categories.dragging = false onDragStopped: categories.isDragging = false
draggerParent: categories draggerParent: categories
contentY: categories.contentY contentY: categories.contentY
contentHeight: categories.contentHeight contentHeight: categories.contentHeight