diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-07 17:36:11 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-04-14 14:51:21 +0200 |
commit | 176b37fe72a4d8e4a497b54208d3a4406b766665 (patch) | |
tree | cccdf2f5c95ce0e94c9ae38221319fcd483787f6 /src/quick/scenegraph | |
parent | 884e823394ebf6e5be30196a3b9a758c30b86f9a (diff) |
Undeprecate (in docs) QSGSimpleRect/TextureNode
In 5.8 the deprecated tag was added since these are not functional when
using a scenegraph backend other than default or software. In 6.0 we no
longer have the d3d12 backend so out of the box QSGSimpleRectNode and
QSGSimpleTextureNode are functional always.
The factory-style QQuickWindow::createImageNode() alternatives are still
preferred, but QSGSimpleTextureNode is used in a number of examples by
subclassing, and the factory function approach is no alternative to
that. Same goes internally, QQuickFramebufferObject is internally
enabled by subclassing QSGSimpleTextureNode. By extension, it is assumed
that there are applications out there relying on these classes too.
So solve the dilemma by removing the \deprecated from the docs and
that's that.
Task-number: QTBUG-82997
Change-Id: I30e8ee6df91fa37a370bba7a0511c95275794e33
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r-- | src/quick/scenegraph/util/qsgsimplerectnode.cpp | 6 | ||||
-rw-r--r-- | src/quick/scenegraph/util/qsgsimpletexturenode.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.cpp b/src/quick/scenegraph/util/qsgsimplerectnode.cpp index 0891f8d95c..de961d4f26 100644 --- a/src/quick/scenegraph/util/qsgsimplerectnode.cpp +++ b/src/quick/scenegraph/util/qsgsimplerectnode.cpp @@ -51,9 +51,9 @@ QT_BEGIN_NAMESPACE \warning This utility class is only functional when running with the default or software backends of the Qt Quick scenegraph. As an alternative, prefer - using QSGRectangleNode via QQuickWindow::createRectangleNode(). - - \deprecated + using QSGRectangleNode via QQuickWindow::createRectangleNode(). However, this + standalone class is still useful when used via subclassing and the + application knows that no special scenegraph backends will be involved. */ diff --git a/src/quick/scenegraph/util/qsgsimpletexturenode.cpp b/src/quick/scenegraph/util/qsgsimpletexturenode.cpp index ff5c53d2ea..8dbfcad38b 100644 --- a/src/quick/scenegraph/util/qsgsimpletexturenode.cpp +++ b/src/quick/scenegraph/util/qsgsimpletexturenode.cpp @@ -99,9 +99,9 @@ static void qsgsimpletexturenode_update(QSGGeometry *g, \warning This utility class is only functional when running with the default or software backends of the Qt Quick scenegraph. As an alternative, prefer - using QSGImageNode via QQuickWindow::createImageNode(). - - \deprecated + using QSGImageNode via QQuickWindow::createImageNode(). However, this + standalone class is still useful when used via subclassing and the + application knows that no special scenegraph backends will be involved. */ /*! |