summaryrefslogtreecommitdiff
path: root/src/libs/tracing
diff options
context:
space:
mode:
Diffstat (limited to 'src/libs/tracing')
-rw-r--r--src/libs/tracing/qml/CategoryLabel.qml2
-rw-r--r--src/libs/tracing/qml/FlameGraphView.qml2
-rw-r--r--src/libs/tracing/qml/MainView.qml4
-rw-r--r--src/libs/tracing/qml/Overview.qml2
-rw-r--r--src/libs/tracing/qml/SelectionRange.qml2
-rw-r--r--src/libs/tracing/qml/SelectionRangeDetails.qml4
-rw-r--r--src/libs/tracing/qml/TimeMarks.qml2
-rw-r--r--src/libs/tracing/qml/TimelineContent.qml6
-rw-r--r--src/libs/tracing/timelinerenderer.cpp5
9 files changed, 12 insertions, 17 deletions
diff --git a/src/libs/tracing/qml/CategoryLabel.qml b/src/libs/tracing/qml/CategoryLabel.qml
index 171c92400e..c47e843f23 100644
--- a/src/libs/tracing/qml/CategoryLabel.qml
+++ b/src/libs/tracing/qml/CategoryLabel.qml
@@ -148,7 +148,7 @@ Item {
property int currentNote: -1
Connections {
target: notesModel
- onChanged: {
+ function onChanged(typeId, modelId, timelineIndex) {
// This will only be called if notesModel != null.
if (modelId === -1 || modelId === model.modelId) {
var notes = notesModel.byTimelineModel(model.modelId);
diff --git a/src/libs/tracing/qml/FlameGraphView.qml b/src/libs/tracing/qml/FlameGraphView.qml
index f98bcb3134..a27f3da8d6 100644
--- a/src/libs/tracing/qml/FlameGraphView.qml
+++ b/src/libs/tracing/qml/FlameGraphView.qml
@@ -307,7 +307,7 @@ ScrollView {
Connections {
target: root.model
- onModelReset: {
+ function onModelReset() {
tooltip.hoveredNode = null;
tooltip.selectedNode = null;
}
diff --git a/src/libs/tracing/qml/MainView.qml b/src/libs/tracing/qml/MainView.qml
index f544721f9a..4e28ea9b26 100644
--- a/src/libs/tracing/qml/MainView.qml
+++ b/src/libs/tracing/qml/MainView.qml
@@ -51,12 +51,12 @@ Rectangle {
// ***** connections with external objects
Connections {
target: zoomControl
- onRangeChanged: {
+ function onRangeChanged() {
zoomSliderToolBar.updateZoomLevel();
content.scroll();
selectionRange.update();
}
- onWindowChanged: {
+ function onWindowChanged() {
content.scroll();
}
}
diff --git a/src/libs/tracing/qml/Overview.qml b/src/libs/tracing/qml/Overview.qml
index e560285802..f24bd03dae 100644
--- a/src/libs/tracing/qml/Overview.qml
+++ b/src/libs/tracing/qml/Overview.qml
@@ -70,7 +70,7 @@ Rectangle {
Connections {
target: zoomer
- onRangeChanged: updateRangeMover()
+ function onRangeChanged() { updateRangeMover(); }
}
TimeDisplay {
diff --git a/src/libs/tracing/qml/SelectionRange.qml b/src/libs/tracing/qml/SelectionRange.qml
index 9f111b75c4..3f10ac3414 100644
--- a/src/libs/tracing/qml/SelectionRange.qml
+++ b/src/libs/tracing/qml/SelectionRange.qml
@@ -68,7 +68,7 @@ RangeMover {
Connections {
target: zoomer
- onWindowChanged: updateRange()
+ function onWindowChanged() { updateRange(); }
}
function setPos(pos) {
diff --git a/src/libs/tracing/qml/SelectionRangeDetails.qml b/src/libs/tracing/qml/SelectionRangeDetails.qml
index 288ac7693c..e5b9c41106 100644
--- a/src/libs/tracing/qml/SelectionRangeDetails.qml
+++ b/src/libs/tracing/qml/SelectionRangeDetails.qml
@@ -48,8 +48,8 @@ Item {
// keep inside view
Connections {
target: selectionRangeDetails.parent
- onWidthChanged: fitInView();
- onHeightChanged: fitInView();
+ function onWidthChanged() { fitInView(); }
+ function onHeightChanged() { fitInView(); }
}
function fitInView() {
diff --git a/src/libs/tracing/qml/TimeMarks.qml b/src/libs/tracing/qml/TimeMarks.qml
index a3622b06d2..a0f93e6ead 100644
--- a/src/libs/tracing/qml/TimeMarks.qml
+++ b/src/libs/tracing/qml/TimeMarks.qml
@@ -70,7 +70,7 @@ Item {
Connections {
target: model
- onExpandedRowHeightChanged: {
+ function onExpandedRowHeightChanged(row, height) {
if (model && model.expanded && row >= 0)
rowRepeater.itemAt(row).height = height;
}
diff --git a/src/libs/tracing/qml/TimelineContent.qml b/src/libs/tracing/qml/TimelineContent.qml
index 5eb667822f..188ee28136 100644
--- a/src/libs/tracing/qml/TimelineContent.qml
+++ b/src/libs/tracing/qml/TimelineContent.qml
@@ -135,8 +135,8 @@ Flickable {
Connections {
target: timelineView
- onClearChildren: renderer.clearData()
- onSelect: {
+ function onClearChildren() { renderer.clearData(); }
+ function onSelect(modelIndex, eventIndex) {
if (modelIndex === index || modelIndex === -1) {
renderer.selectedItem = eventIndex;
if (eventIndex !== -1)
@@ -167,7 +167,7 @@ Flickable {
Connections {
target: model
- onDetailsChanged: {
+ function onDetailsChanged() {
if (selectedItem != -1) {
flick.propagateSelection(-1, -1);
flick.propagateSelection(index, selectedItem);
diff --git a/src/libs/tracing/timelinerenderer.cpp b/src/libs/tracing/timelinerenderer.cpp
index 2abd234e01..195e08edc9 100644
--- a/src/libs/tracing/timelinerenderer.cpp
+++ b/src/libs/tracing/timelinerenderer.cpp
@@ -209,13 +209,8 @@ void TimelineRenderer::wheelEvent(QWheelEvent *event)
int degrees = (event->angleDelta().x() + event->angleDelta().y()) / 8;
const qint64 circle = 360;
-#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- qint64 mouseTime = event->pos().x() * zoom->windowDuration() / width() +
- zoom->windowStart();
-#else
qint64 mouseTime = event->position().toPoint().x() * zoom->windowDuration() / width() +
zoom->windowStart();
-#endif
qint64 beforeMouse = (mouseTime - zoom->rangeStart()) * (circle - degrees) / circle;
qint64 afterMouse = (zoom->rangeEnd() - mouseTime) * (circle - degrees) / circle;
View Lorry Controller Status