From 0df4d8aa9ed849af00fb056dcc7af87ea1e90f20 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sat, 29 Aug 2020 19:09:31 +0800 Subject: Doc: Capitalize "GUI" correctly Change-Id: I2230e2dcb7bc2497b5dbe71a22c21d84176b5e57 Reviewed-by: Samuel Gaist (cherry picked from commit fd105380eb4f43c08578b6fe5ce3e5c6dd4b35d6) Reviewed-by: Paul Wicking --- .../metaltextureimport/doc/src/metaltextureimport.qdoc | 2 +- src/quick/items/qquickrendercontrol.cpp | 2 +- src/quick/items/qquickwindow.cpp | 10 +++++----- src/quick/scenegraph/qsgcontext.cpp | 6 +++--- src/quickshapes/qquickshape.cpp | 2 +- src/quickwidgets/qquickwidget.cpp | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc index 55cbcd8f2e..1d6e0ab5c0 100644 --- a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc +++ b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc @@ -66,7 +66,7 @@ \snippet scenegraph/metaltextureimport/metaltextureimport.mm 2 The updatePaintNode() function of the item is called on the render thread - (if there is one), with the main (gui) thread blocked. Here we create a new + (if there is one), with the main (GUI) thread blocked. Here we create a new node if there has not yet been one, and update it. Accessing Qt objects living on the main thread is safe here, so sync() will calculate and copy the values it needs from QQuickItem or QQuickWindow. 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 diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 28d8c19d5d..c49fb17387 100644 --- a/src/quick/scenegraph/qsgcontext.cpp +++ b/src/quick/scenegraph/qsgcontext.cpp @@ -271,8 +271,8 @@ QSGInternalRectangleNode *QSGContext::createInternalRectangleNode(const QRectF & /*! Creates a new shader effect helper instance. This function is called on the - gui thread, unlike the others. This is necessary in order to provide - adaptable, backend-specific shader effect functionality to the gui thread too. + GUI thread, unlike the others. This is necessary in order to provide + adaptable, backend-specific shader effect functionality to the GUI thread too. */ QSGGuiThreadShaderEffectManager *QSGContext::createGuiThreadShaderEffectManager() { @@ -305,7 +305,7 @@ QSize QSGContext::minimumFBOSize() const /*! Returns a pointer to the (presumably) global renderer interface. - \note This function may be called on the gui thread in order to get access + \note This function may be called on the GUI thread in order to get access to QSGRendererInterface::graphicsApi() and other getters. \note it is expected that the simple queries (graphicsApi, shaderType, diff --git a/src/quickshapes/qquickshape.cpp b/src/quickshapes/qquickshape.cpp index dcd331b388..8f2ef3cfc1 100644 --- a/src/quickshapes/qquickshape.cpp +++ b/src/quickshapes/qquickshape.cpp @@ -723,7 +723,7 @@ QQuickShape::RendererType QQuickShape::rendererType() const set this property to \c true. When enabled, making a Shape visible will not wait for the content to - become available. Instead, the gui/main thread is not blocked and the + become available. Instead, the GUI/main thread is not blocked and the results of the path rendering are shown only when all the asynchronous work has been finished. diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 6273a140f6..99b55d1df5 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -690,7 +690,7 @@ QQmlContext* QQuickWidget::rootContext() 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. \sa QQuickWindow::sceneGraphError() */ -- cgit v1.2.3