diff options
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qsurfaceformat.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qtestsupport_gui.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
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 { |