Merge tag 'v6.2.11-lts' into tqtc/lts-6.2-opensource

Qt 6.2.11-lts release

Conflicts solved:
	dependencies.yaml

Change-Id: I088fe99748b323fbdf49c3766c262eb2a05131d9

1 files changed, 4 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index 5b859adba1..77b674a22a 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
@@ -550,7 +550,8 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio
     \value StackView.ReplaceTransition An operation with replace transitions (since QtQuick.Controls 2.1).
     \value StackView.PopTransition An operation with pop transitions (since QtQuick.Controls 2.1).
 
-    If no operation is provided, \c PushTransition will be used.
+    If no operation is provided, \c Immediate will be used if the stack is
+    empty, and \c PushTransition otherwise.
 
     \note Items that already exist in the stack are not pushed.
 
@@ -792,7 +793,8 @@ void QQuickStackView::pop(QQmlV4Function *args)
     \value StackView.ReplaceTransition An operation with replace transitions (since QtQuick.Controls 2.1).
     \value StackView.PopTransition An operation with pop transitions (since QtQuick.Controls 2.1).
 
-    If no operation is provided, \c ReplaceTransition will be used.
+    If no operation is provided, \c Immediate will be used if the stack is
+    empty, and \c ReplaceTransition otherwise.
 
     The following example illustrates the use of push and pop transitions with replace().