Merge remote-tracking branch 'origin/tqtc/lts-6.2.8' into tqtc/lts-6.2-opensource

Conflicts solved in a file:
	dependencies.yaml

Change-Id: I500b721c4dd4f139c0dd26dab084505ec485c4a4

7 files changed, 29 insertions, 10 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 07d90b8a..e62fae5e 100644
--- a/.cmake.conf
+++ b/.cmake.conf
@@ -1,2 +1,2 @@
-set(QT_REPO_MODULE_VERSION "6.2.7")
+set(QT_REPO_MODULE_VERSION "6.2.8")
 set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "")
diff --git a/.qmake.conf b/.qmake.conf
index 71f407e6..3a8fd966 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
 
 DEFINES += QT_NO_JAVA_STYLE_ITERATORS
 
-MODULE_VERSION = 6.2.7
+MODULE_VERSION = 6.2.8
diff --git a/dependencies.yaml b/dependencies.yaml
index 4049adf4..60640753 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,10 +1,10 @@
 dependencies:
   ../tqtc-qtbase:
-    ref: 694575a59b5370afc494fbf700eee8db1d1ec091
+    ref: 67934c103800bae50c2ec1977758d40fa8e4e507
     required: true
   ../tqtc-qtdeclarative:
-    ref: 02277e3753613d9e19bbb36367c7d2b1d13d7545
+    ref: 302ab20d46280e11042f3896460c55d8b8146e41
     required: false
   ../tqtc-qtmultimedia:
-    ref: 7d7a5a372afd1e1c9f6407f8fd90b5ee56723367
+    ref: 644e97ff4a0115e9df2579a10367c2649892741f
     required: false
diff --git a/examples/charts/audio/CMakeLists.txt b/examples/charts/audio/CMakeLists.txt
index 6349e31d..3148f9c8 100644
--- a/examples/charts/audio/CMakeLists.txt
+++ b/examples/charts/audio/CMakeLists.txt
@@ -28,6 +28,7 @@ qt_add_executable(audio
 set_target_properties(audio PROPERTIES
     WIN32_EXECUTABLE TRUE
     MACOSX_BUNDLE TRUE
+    MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/apple/Info.plist.in"
 )
 target_link_libraries(audio PUBLIC
     Qt::Charts
diff --git a/examples/charts/audio/apple/Info.plist.in b/examples/charts/audio/apple/Info.plist.in
new file mode 100644
index 00000000..9e6cc252
--- /dev/null
+++ b/examples/charts/audio/apple/Info.plist.in
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+
+	<key>NSMicrophoneUsageDescription</key>
+	<string>Qt Charts Example</string>
+</dict>
+</plist>
diff --git a/src/charts/legend/legendmarkeritem.cpp b/src/charts/legend/legendmarkeritem.cpp
index c9b2b817..eda5df19 100644
--- a/src/charts/legend/legendmarkeritem.cpp
+++ b/src/charts/legend/legendmarkeritem.cpp
@@ -147,7 +147,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/src/charts/xychart/qxyseries.cpp b/src/charts/xychart/qxyseries.cpp
index aba693b6..eabca0b2 100644
--- a/src/charts/xychart/qxyseries.cpp
+++ b/src/charts/xychart/qxyseries.cpp
@@ -1907,13 +1907,18 @@ void QXYSeriesPrivate::drawBestFitLine(QPainter *painter, const QRectF &clipRect
     if (!ok)
         return;
 
-    const qreal x1 = clipRect.x();
+    auto *domain = this->domain();
+    const auto clipOriginX = domain->isReverseX() ? clipRect.right() : clipRect.left();
+    const auto clipOriginY = domain->isReverseY() ? clipRect.top() : clipRect.bottom();
+    const auto domainOrigin = domain->calculateDomainPoint({clipOriginX, clipOriginY});
+
+    const qreal x1 = domainOrigin.x();
     const qreal y1 = bestFitLineParams.first * x1 + bestFitLineParams.second;
-    QPointF p1 = domain()->calculateGeometryPoint(QPointF(x1, y1), ok);
+    QPointF p1 = domain->calculateGeometryPoint(QPointF(x1, y1), ok);
 
-    const qreal x2 = clipRect.x() + 1;
+    const qreal x2 = domainOrigin.x() + 1;
     const qreal y2 = bestFitLineParams.first * x2 + bestFitLineParams.second;
-    QPointF p2 = domain()->calculateGeometryPoint(QPointF(x2, y2), ok);
+    QPointF p2 = domain->calculateGeometryPoint(QPointF(x2, y2), ok);
 
     if (ok) {
         QLineF bestFitLine { p1, p2 };