diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2020-08-29 19:09:31 +0800 |
|---|---|---|
| committer | Sze Howe Koh <szehowe.koh@gmail.com> | 2020-08-31 09:23:09 +0800 |
| commit | 0df4d8aa9ed849af00fb056dcc7af87ea1e90f20 (patch) | |
| tree | 6a3e7a3cbaaa3de63f5679b6731d66e428e72c7f /src/quick/items | |
| parent | fce721c9224ad83898a2ddf8c4aa40b795dc6f77 (diff) | |
Doc: Capitalize "GUI" correctly
Change-Id: I2230e2dcb7bc2497b5dbe71a22c21d84176b5e57
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
(cherry picked from commit fd105380eb4f43c08578b6fe5ce3e5c6dd4b35d6)
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/quick/items')
| -rw-r--r-- | src/quick/items/qquickrendercontrol.cpp | 2 | ||||
| -rw-r--r-- | src/quick/items/qquickwindow.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickrendercontrol.cpp b/src/quick/items/qquickrendercontrol.cpp index 9f9777f199..82c9e374a5 100644 --- a/src/quick/items/qquickrendercontrol.cpp +++ b/src/quick/items/qquickrendercontrol.cpp @@ -200,7 +200,7 @@ void QQuickRenderControlPrivate::windowDestroyed() } /*! - Prepares rendering the Qt Quick scene outside the gui thread. + Prepares rendering the Qt Quick scene outside the GUI thread. \a targetThread specifies the thread on which synchronization and rendering will happen. There is no need to call this function in a diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index 906d59e6d3..a66e98d66f 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -4025,7 +4025,7 @@ bool QQuickWindow::isSceneGraphInitialized() const connected to the signal, the behavior will be different: Quick will print the \a message, or show a message box, and terminate the application. - This signal will be emitted from the gui thread. + This signal will be emitted from the GUI thread. \since 5.3 */ @@ -4577,10 +4577,10 @@ QQmlIncubationController *QQuickWindow::incubationController() const /*! \fn void QQuickWindow::afterAnimating() - This signal is emitted on the gui thread before requesting the render thread to + This signal is emitted on the GUI thread before requesting the render thread to perform the synchronization of the scene graph. - Unlike the other similar signals, this one is emitted on the gui thread + Unlike the other similar signals, this one is emitted on the GUI thread instead of the render thread. It can be used to synchronize external animation systems with the QML content. At the same time this means that this signal is not suitable for triggering graphics operations. @@ -4591,7 +4591,7 @@ QQmlIncubationController *QQuickWindow::incubationController() const /*! \qmlsignal QtQuick.Window::Window::afterAnimating() - This signal is emitted on the gui thread before requesting the render thread to + This signal is emitted on the GUI thread before requesting the render thread to perform the synchronization of the scene graph. You can implement onAfterAnimating to do additional processing after each animation step. @@ -4602,7 +4602,7 @@ QQmlIncubationController *QQuickWindow::incubationController() const /*! \fn void QQuickWindow::openglContextCreated(QOpenGLContext *context) - This signal is emitted on the gui thread when the OpenGL \a context + This signal is emitted on the GUI thread when the OpenGL \a context for this window is created, before it is made current. Some implementations will share the same OpenGL context between |