From 79c3fb123d166f1eb355e064ee6cc6aca0e4749a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Fri, 19 Apr 2024 12:32:37 +0200 Subject: Doc: Fix mentioning of QQW::createTextureFromNativeObject in example MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The method got removed in Qt 6.0, and the example code was adjusted accordingly (commit fb96109bbc2ec5d). While at it, also remove the mentioning of the even older QQuickWindow::createTextureFromId(), as that is most likely not relevant for new users looking into this example. Pick-to: 6.6 6.7 Change-Id: I2ea3fcf3de78e13afec9e2b25aa8d4a6a9a9b571 Reviewed-by: Tor Arne Vestbø --- .../scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc index 78babe6ca5..3b4912829e 100644 --- a/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc +++ b/examples/quick/scenegraph/metaltextureimport/doc/src/metaltextureimport.qdoc @@ -64,9 +64,8 @@ After copying the values we need, sync() also performs some graphics resource initialization. The MTLDevice is queried from the scenegraph. Once a MTLTexture is available, a QSGTexture wrapping (not owning) it is created - via QQuickWindow::createTextureFromNativeObject(). This function is a - modern equivalent to QQuickWindow::createTextureFromId() that is not tied - to OpenGL. Finally, the QSGTexture is associated with the underlying + via \l QNativeInterface::QSGOpenGLTexture::fromNative(). + Finally, the QSGTexture is associated with the underlying materials by calling the base class' setTexture() function. \snippet scenegraph/metaltextureimport/metaltextureimport.mm 6 -- cgit v1.2.3