diff options
-rw-r--r-- | examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc | 2 | ||||
-rw-r--r-- | src/quick/items/qquickrendercontrol.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 12 | ||||
-rw-r--r-- | src/quick/scenegraph/qsgcontext.cpp | 6 | ||||
-rw-r--r-- | src/quickshapes/qquickshape.cpp | 2 | ||||
-rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 2 |
6 files changed, 13 insertions, 13 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 75472c3e6e..97c7f04553 100644 --- a/src/quick/items/qquickrendercontrol.cpp +++ b/src/quick/items/qquickrendercontrol.cpp @@ -211,7 +211,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 9489789a87..0b7ac0b0ee 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1590,7 +1590,7 @@ void QQuickWindowPrivate::cleanup(QSGNode *n) and device contexts, Vulkan and Metal devices. These are also queriable by application code afterwards via \l{QSGRendererInterface::getResource()}{QSGRendererInterface}. When using - the \c basic render loop, which performs all rendering on the gui thread, + the \c basic render loop, which performs all rendering on the GUI thread, the same context or device is used with all visible QQuickWindows. The \c threaded render loop uses a dedicated context or device object for each rendering thread, and so for each QQuickWindow. With some graphics APIs, @@ -4099,7 +4099,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 */ @@ -4635,10 +4635,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. @@ -4649,7 +4649,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. @@ -5593,7 +5593,7 @@ void QQuickWindow::setGraphicsApi(QSGRendererInterface::GraphicsApi api) what API the scene graph would choose if it was initialized at the point of the call. - \note This static function is intended to be called on the main (gui) + \note This static function is intended to be called on the main (GUI) thread only. For querying the API when rendering, use QSGRendererInterface since that object lives on the render thread. diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp index 3275efdb15..799afbc2ba 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 3fa4a74a01..4600e3ead7 100644 --- a/src/quickshapes/qquickshape.cpp +++ b/src/quickshapes/qquickshape.cpp @@ -714,7 +714,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 e7a9095f4f..572e436cc5 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -734,7 +734,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() */ |