7 files changed, 30 insertions, 6 deletions
diff --git a/src/gui/accessible/linux/atspiadaptor.cpp b/src/gui/accessible/linux/atspiadaptor.cpp
index e0cd5aee25c..d6e46a6ca74 100644
--- a/src/gui/accessible/linux/atspiadaptor.cpp
+++ b/src/gui/accessible/linux/atspiadaptor.cpp
@@ -1011,6 +1011,24 @@ void AtSpiAdaptor::notify(QAccessibleEvent *event)
         }
         break;
     }
+    case QAccessible::RoleChanged: {
+        if (sendObject || sendObject_property_change
+            || sendObject_property_change_accessible_role) {
+            QAccessibleInterface *iface = event->accessibleInterface();
+            if (!iface || !iface->isValid()) {
+                qCDebug(lcAccessibilityAtspi, "RoleChanged event from invalid accessible.");
+                return;
+            }
+
+            QString path = pathForInterface(iface);
+            QVariantList args = packDBusSignalArguments(
+                    "accessible-role"_L1, 0, 0,
+                    QVariant::fromValue(QDBusVariant(uint(getRole(iface)))));
+            sendDBusSignal(path, ATSPI_DBUS_INTERFACE_EVENT_OBJECT ""_L1, "PropertyChange"_L1,
+                           args);
+        }
+        break;
+    }
     case QAccessible::DescriptionChanged: {
         if (sendObject || sendObject_property_change || sendObject_property_change_accessible_description) {
             QAccessibleInterface *iface = event->accessibleInterface();
diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index f605ada029c..004f653bb6e 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -230,6 +230,7 @@ Q_STATIC_LOGGING_CATEGORY(lcAccessibilityCore, "qt.accessibility.core");
     \value ParentChanged                    An object's parent object changed.
     \value PopupMenuEnd                     A pop-up menu has closed.
     \value PopupMenuStart                   A pop-up menu has opened.
+    \value [since 6.11] RoleChanged         The role of an object has changed.
     \value ScrollingEnd                     A scrollbar scroll operation has ended (the mouse has
                                             released the slider handle).
     \value ScrollingStart                   A scrollbar scroll operation is about to start; this may
diff --git a/src/gui/accessible/qaccessible_base.h b/src/gui/accessible/qaccessible_base.h
index 9538d126ede..0a1a305b76d 100644
--- a/src/gui/accessible/qaccessible_base.h
+++ b/src/gui/accessible/qaccessible_base.h
@@ -103,6 +103,7 @@ public:
         AcceleratorChanged   = 0x80C0,
         Announcement         = 0x80D0,
         IdentifierChanged    = 0x80E0,
+        RoleChanged          = 0x80E1,
 
         // was declared after AcceleratorChanged, without explicit value
         InvalidEvent                    = AcceleratorChanged + 1,
diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp
index 59c469ae6b6..b53e1a63870 100644
--- a/src/gui/kernel/qsurfaceformat.cpp
+++ b/src/gui/kernel/qsurfaceformat.cpp
@@ -552,7 +552,7 @@ void QSurfaceFormat::setAlphaBufferSize(int size)
     and used choice is the former (16-bit), for example when high dynamic range
     rendering is desired.
 
-    \since 6.10
+    \since 6.11
 
     \sa colorComponentType()
 */
@@ -567,7 +567,7 @@ void QSurfaceFormat::setColorComponentType(ColorComponentType type)
 /*!
     \return the color component type.
 
-    \since 6.10
+    \since 6.11
 
     \sa setColorComponentType()
 */
diff --git a/src/gui/kernel/qtestsupport_gui.cpp b/src/gui/kernel/qtestsupport_gui.cpp
index dfcea928fd8..ba247800e7b 100644
--- a/src/gui/kernel/qtestsupport_gui.cpp
+++ b/src/gui/kernel/qtestsupport_gui.cpp
@@ -70,7 +70,7 @@ bool QTest::qWaitForWindowActive(QWindow *window, QDeadlineTimer timeout)
 */
 bool QTest::qWaitForWindowActive(QWindow *window)
 {
-    return qWaitForWindowActive(window, Internal::defaultTryTimeout);
+    return qWaitForWindowActive(window, defaultTryTimeout.load(std::memory_order_relaxed));
 }
 
 /*!
@@ -102,7 +102,7 @@ Q_GUI_EXPORT bool QTest::qWaitForWindowFocused(QWindow *window, QDeadlineTimer t
 */
 bool QTest::qWaitForWindowFocused(QWindow *window)
 {
-    return qWaitForWindowFocused(window, Internal::defaultTryTimeout);
+    return qWaitForWindowFocused(window, defaultTryTimeout.load(std::memory_order_relaxed));
 }
 
 /*!
@@ -143,7 +143,7 @@ bool QTest::qWaitForWindowExposed(QWindow *window, QDeadlineTimer timeout)
 */
 bool QTest::qWaitForWindowExposed(QWindow *window)
 {
-    return qWaitForWindowExposed(window, Internal::defaultTryTimeout);
+    return qWaitForWindowExposed(window, defaultTryTimeout.load(std::memory_order_relaxed));
 }
 
 namespace QTest {
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 1703fa5b0fe..1e0f9295110 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -4,6 +4,8 @@
 #include "qmatrix4x4.h"
 #include <QtCore/qmath.h>
 #include <QtCore/qvariant.h>
+
+#include <QtGui/qquaternion.h>
 #include <QtGui/qtransform.h>
 
 #include <cmath>
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 80ba62ca36f..2ba274d4517 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -7,7 +7,6 @@
 #include <QtGui/qtguiglobal.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qvector4d.h>
-#include <QtGui/qquaternion.h>
 #include <QtGui/qgenericmatrix.h>
 #include <QtCore/qrect.h>
 
@@ -15,6 +14,9 @@ class tst_QMatrixNxN;
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_QUATERNION
+class QQuaternion;
+#endif
 
 #ifndef QT_NO_MATRIX4X4