diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:44 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2024-01-04 21:21:44 +0200 |
| commit | 3f3f14d69a509c3e8027bfb5d7ffca9b4f3ef003 (patch) | |
| tree | 4f219dda24599754f53db5707b7cc34fb31047b0 | |
| parent | 393a84ad5b16a9ec93d8a44bebf1ae86e881bc06 (diff) | |
| parent | 934bf80e55bf02e16b337272f6b1e598a5de6322 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.13' into tqtc/lts-5.15-opensourcev5.15.13-lts-lgpl5.15
Change-Id: I3220e710a1556a85c344e1086e5924d45595cf86
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | src/charts/legend/legendmarkeritem.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qbarseries/BLACKLIST | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf index bf8c411f..4a55f521 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.12 +MODULE_VERSION = 5.15.13 diff --git a/src/charts/legend/legendmarkeritem.cpp b/src/charts/legend/legendmarkeritem.cpp index 2986b687..7121783d 100644 --- a/src/charts/legend/legendmarkeritem.cpp +++ b/src/charts/legend/legendmarkeritem.cpp @@ -126,7 +126,7 @@ QFont LegendMarkerItem::font() const void LegendMarkerItem::setLabel(const QString label) { m_label = label; - updateGeometry(); + m_marker->invalidateLegend(); } QString LegendMarkerItem::label() const diff --git a/tests/auto/qbarseries/BLACKLIST b/tests/auto/qbarseries/BLACKLIST index a1b10c85..c8b10b7d 100644 --- a/tests/auto/qbarseries/BLACKLIST +++ b/tests/auto/qbarseries/BLACKLIST @@ -1,2 +1,4 @@ [mousehovered] macos +# QTBUG-111293 +sles-15 |