summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2023-04-24 10:13:34 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2023-04-24 10:13:34 +0300
commit7ce22b0633eb9d1eb59854fee4f2f545e1b842e0 (patch)
treec61c462f0c307bedb9e0e77ab774c797963bacba
parent3d4a84eb6d62ce22a47794f309f9268729ac375f (diff)
parentcbe4ef961ded2671b3a5e330705b95c390c6a423 (diff)
Merge remote-tracking branch 'origin/tqtc/lts-5.15.10' into tqtc/lts-5.15-opensourcev5.15.10-lts-lgpl
-rw-r--r--.qmake.conf2
-rw-r--r--src/charts/axis/horizontalaxis.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf
index 3283eb34..f3c8954d 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.9
+MODULE_VERSION = 5.15.10
diff --git a/src/charts/axis/horizontalaxis.cpp b/src/charts/axis/horizontalaxis.cpp
index 5b74b563..a54339aa 100644
--- a/src/charts/axis/horizontalaxis.cpp
+++ b/src/charts/axis/horizontalaxis.cpp
@@ -436,12 +436,12 @@ void HorizontalAxis::updateMinorTickGeometry()
qreal minorArrowLineItemY2;
switch (axis()->alignment()) {
case Qt::AlignTop:
- minorArrowLineItemY1 = gridGeometry().bottom();
- minorArrowLineItemY2 = gridGeometry().bottom() - labelPadding() / 2.0;
+ minorArrowLineItemY1 = gridGeometry().top();
+ minorArrowLineItemY2 = gridGeometry().top() - labelPadding() / 2.0;
break;
case Qt::AlignBottom:
- minorArrowLineItemY1 = gridGeometry().top();
- minorArrowLineItemY2 = gridGeometry().top() + labelPadding() / 2.0;
+ minorArrowLineItemY1 = gridGeometry().bottom();
+ minorArrowLineItemY2 = gridGeometry().bottom() + labelPadding() / 2.0;
break;
default:
minorArrowLineItemY1 = 0.0;