diff options
| author | Eike Ziller <[email protected]> | 2023-10-09 10:53:57 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2023-10-09 11:15:51 +0000 |
| commit | 3b516524e3da4c38dd50c02f89fa856b7bb4e96f (patch) | |
| tree | 892de7d75dc5f8592403c0756cc4251f1fc7bcba /src/libs/tracing | |
| parent | d4e7dfca76997a72e49b6486d51f562c3773d8f7 (diff) | |
Fix QmlProfiler when built with Qt 6.6
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 <[email protected]>
Diffstat (limited to 'src/libs/tracing')
| -rw-r--r-- | src/libs/tracing/qml/CategoryLabel.qml | 10 | ||||
| -rw-r--r-- | src/libs/tracing/qml/TimelineLabels.qml | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/libs/tracing/qml/CategoryLabel.qml b/src/libs/tracing/qml/CategoryLabel.qml index 58704aa175a..db58b13c0ff 100644 --- a/src/libs/tracing/qml/CategoryLabel.qml +++ b/src/libs/tracing/qml/CategoryLabel.qml @@ -15,7 +15,7 @@ Item { property bool expanded: model && model.expanded property var labels: (expanded && model) ? model.labels : [] - property bool dragging + property bool isDragging property int visualIndex property int dragOffset property Item draggerParent @@ -38,10 +38,10 @@ Item { id: dragArea anchors.fill: txt drag.target: dragger - cursorShape: labelContainer.dragging ? Qt.ClosedHandCursor : Qt.OpenHandCursor + cursorShape: labelContainer.isDragging ? Qt.ClosedHandCursor : Qt.OpenHandCursor // Account for parent change below - drag.minimumY: labelContainer.dragging ? 0 : -labelContainer.dragOffset - drag.maximumY: labelContainer.visibleHeight - (labelContainer.dragging ? 0 : labelContainer.dragOffset) + drag.minimumY: labelContainer.isDragging ? 0 : -labelContainer.dragOffset + drag.maximumY: labelContainer.visibleHeight - (labelContainer.isDragging ? 0 : labelContainer.dragOffset) drag.axis: Drag.YAxis hoverEnabled: true ToolTip { @@ -221,7 +221,7 @@ Item { MouseArea { 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.right: labelContainer.right cursorShape: dragArea.cursorShape diff --git a/src/libs/tracing/qml/TimelineLabels.qml b/src/libs/tracing/qml/TimelineLabels.qml index 754f36e1902..99f36467875 100644 --- a/src/libs/tracing/qml/TimelineLabels.qml +++ b/src/libs/tracing/qml/TimelineLabels.qml @@ -26,7 +26,7 @@ Flickable { // 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 // events, so we can't use the drag events to determine the cursor shape. - property bool dragging: false + property bool isDragging: false Column { id: categoryContent @@ -75,10 +75,10 @@ Flickable { model: modelData notesModel: categories.modelProxy.notes visualIndex: loader.visualIndex - dragging: categories.dragging + isDragging: categories.isDragging reverseSelect: categories.reverseSelect - onDragStarted: categories.dragging = true - onDragStopped: categories.dragging = false + onDragStarted: categories.isDragging = true + onDragStopped: categories.isDragging = false draggerParent: categories contentY: categories.contentY contentHeight: categories.contentHeight |