diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:37:15 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-08-16 20:37:15 +0300 |
| commit | 841083c263f16f8acb81e4915bf24bbed0461c9a (patch) | |
| tree | a9017f1b5ef826f21b21e502819e9a8bcedbf220 | |
| parent | 68f09a304711b2874985227bd78f782a9b67def9 (diff) | |
| parent | 7c0ee223da48940576d5af528b5ed14e5b165692 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into tqtc/lts-5.15-opensourcev5.15.6-lts-lgpl
Change-Id: Idc0b47bf40bf2d010987d024eaccb4006720cf74
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/charts/axis/valueaxis/qvalueaxis.cpp | 2 | ||||
| -rw-r--r-- | src/charts/layout/cartesianchartlayout.cpp | 16 |
3 files changed, 6 insertions, 14 deletions
diff --git a/.qmake.conf b/.qmake.conf index 0eeba9a5..02c9e618 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.5 +MODULE_VERSION = 5.15.6 diff --git a/src/charts/axis/valueaxis/qvalueaxis.cpp b/src/charts/axis/valueaxis/qvalueaxis.cpp index 905168d7..90954483 100644 --- a/src/charts/axis/valueaxis/qvalueaxis.cpp +++ b/src/charts/axis/valueaxis/qvalueaxis.cpp @@ -200,7 +200,7 @@ QT_CHARTS_BEGIN_NAMESPACE \sa QString::asprintf() */ /*! - \qmlproperty real ValueAxis::labelFormat + \qmlproperty string ValueAxis::labelFormat The format string supports the following conversion specifiers, length modifiers, and flags provided by \c printf() in the standard C++ library: d, i, o, x, X, f, F, e, E, g, G, c. diff --git a/src/charts/layout/cartesianchartlayout.cpp b/src/charts/layout/cartesianchartlayout.cpp index a446c7d5..5e32c2e1 100644 --- a/src/charts/layout/cartesianchartlayout.cpp +++ b/src/charts/layout/cartesianchartlayout.cpp @@ -193,18 +193,14 @@ QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry, if (leftSqueezeRatio < 1.0) width *= leftSqueezeRatio; leftOffset+=width; - axis->setGeometry(QRect(chartRect.left() - leftOffset, chartRect.top(), - width, chartRect.bottom()), - chartRect); + axis->setGeometry(QRect(chartRect.left()-leftOffset, geometry.top(),width, geometry.bottom()),chartRect); break; } case Qt::AlignRight:{ qreal width = size.width(); if (rightSqueezeRatio < 1.0) width *= rightSqueezeRatio; - axis->setGeometry(QRect(chartRect.right() + rightOffset, chartRect.top(), - width, chartRect.bottom()), - chartRect); + axis->setGeometry(QRect(chartRect.right()+rightOffset,geometry.top(),width,geometry.bottom()),chartRect); rightOffset+=width; break; } @@ -212,9 +208,7 @@ QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry, qreal height = size.height(); if (topSqueezeRatio < 1.0) height *= topSqueezeRatio; - axis->setGeometry(QRect(chartRect.left(), chartRect.top() - topOffset - height, - chartRect.width(), height), - chartRect); + axis->setGeometry(QRect(geometry.left(), chartRect.top() - topOffset - height, geometry.width(), height), chartRect); topOffset += height; break; } @@ -222,9 +216,7 @@ QRectF CartesianChartLayout::calculateAxisGeometry(const QRectF &geometry, qreal height = size.height(); if (bottomSqueezeRatio < 1.0) height *= bottomSqueezeRatio; - axis->setGeometry(QRect(chartRect.left(), chartRect.bottom() + bottomOffset, - chartRect.width(), height), - chartRect); + axis->setGeometry(QRect(geometry.left(), chartRect.bottom() + bottomOffset, geometry.width(), height), chartRect); bottomOffset += height; break; } |