Merge tag 'v6.2.9-lts' into tqtc/lts-6.2-opensource6.2.9

Qt 6.2.9-lts release

Conflicts solved:
	dependencies.yaml
	examples/webenginewidgets/push-notifications/CMakeLists.txt

Change-Id: I0127c2575369f6939df89f3301659470d481b9bf

1 files changed, 5 insertions, 6 deletions

diff --git a/src/pdf/qpdflink.cpp b/src/pdf/qpdflink.cpp
index d1f5bdfdc..0c2867086 100644
--- a/src/pdf/qpdflink.cpp
+++ b/src/pdf/qpdflink.cpp
@@ -152,12 +152,11 @@ QList<QRectF> QPdfLink::rectangles() const
 */
 QString QPdfLink::toString() const
 {
-    static const QString format = QPdfLinkModel::tr("page %1 location %2,%3 zoom %4");
-    return d->page > 0 ? format.arg(QString::number(d->page),
-                                    QString::number(d->location.x()),
-                                    QString::number(d->location.y()),
-                                    QString::number(d->zoom))
-                       : d->url.toString();
+    if (d->page <= 0)
+         return d->url.toString();
+    return QPdfLinkModel::tr("Page %1 location %2, %3 zoom %4")
+        .arg(d->page).arg(d->location.x(), 0, 'f', 1).arg(d->location.y(), 0, 'f', 1)
+        .arg(d->zoom, 0, 'f', 0);
 }
 
 /*!