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: Ic430f0431e5061045742afc5e712d2ec388e7aa3

7 files changed, 16 insertions, 6 deletions

diff --git a/.cmake.conf b/.cmake.conf
index 07d90b8..e62fae5 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 c1ced29..0249d3b 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -4,4 +4,4 @@ CONFIG += warning_clean
 
 DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS
 
-MODULE_VERSION = 6.2.7
+MODULE_VERSION = 6.2.8
diff --git a/dependencies.yaml b/dependencies.yaml
index 0cc657f..31b554e 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -1,7 +1,7 @@
 dependencies:
   ../tqtc-qtbase:
-    ref: 694575a59b5370afc494fbf700eee8db1d1ec091
+    ref: 67934c103800bae50c2ec1977758d40fa8e4e507
     required: true
   ../tqtc-qtdeclarative:
-    ref: 02277e3753613d9e19bbb36367c7d2b1d13d7545
+    ref: 302ab20d46280e11042f3896460c55d8b8146e41
     required: true
diff --git a/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc b/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc
index 3b7c5ef..5affa08 100644
--- a/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc
+++ b/src/scxml/doc/qtscxml-instantiating-state-machines.qdoc
@@ -118,6 +118,7 @@
     \code
     stateMachine->connectToState("red", [](bool active) {
         qDebug() << (active ? "entered" : "exited") << "the red state";
+    });
     \endcode
 
     And in QML:
diff --git a/src/statemachineqml/signaltransition.cpp b/src/statemachineqml/signaltransition.cpp
index e21da73..ba80850 100644
--- a/src/statemachineqml/signaltransition.cpp
+++ b/src/statemachineqml/signaltransition.cpp
@@ -203,7 +203,11 @@ void SignalTransition::connectTriggered()
     QV4::Scope scope(jsEngine);
     QV4::Scoped<QV4::QObjectMethod> qobjectSignal(
                 scope, QJSValuePrivate::asReturnedValue(&m_signal.value()));
-    Q_ASSERT(qobjectSignal);
+    if (!qobjectSignal) {
+        m_signalExpression.adopt(nullptr);
+        return;
+    }
+
     QMetaMethod metaMethod = target->metaObject()->method(qobjectSignal->methodIndex());
     int signalIndex = QMetaObjectPrivate::signalIndex(metaMethod);
 
diff --git a/tests/auto/qml/qqmlstatemachine/data/signaltransition.qml b/tests/auto/qml/qqmlstatemachine/data/signaltransition.qml
index 52c62a7..09f344a 100644
--- a/tests/auto/qml/qqmlstatemachine/data/signaltransition.qml
+++ b/tests/auto/qml/qqmlstatemachine/data/signaltransition.qml
@@ -48,4 +48,8 @@ Item {
         guard: 2 + 2
     }
 
+    SignalTransition {
+        // Do not crash on SignalTransition without signal
+        onTriggered: () => {}
+    }
 }
diff --git a/tools/qscxmlc/moc.h b/tools/qscxmlc/moc.h
index 9639122..3e092d1 100644
--- a/tools/qscxmlc/moc.h
+++ b/tools/qscxmlc/moc.h
@@ -30,6 +30,7 @@
 #define MOC_H
 
 // -- QtScxml
+#include <QtCore/private/qtools_p.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qjsondocument.h>
@@ -133,7 +134,7 @@ struct PropertyDef
 {
     bool stdCppSet() const {
         QByteArray s("set");
-        s += toupper(name[0]);
+        s += QtMiscUtils::toAsciiUpper(name[0]);
         s += name.mid(1);
         return (s == write);
     }