From d0d2e7da01963988441aa41a9616fb3a904306b2 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Fri, 30 Aug 2019 11:55:33 +0200 Subject: [PATCH] Rename textureinsgnode example to a more fitting name It shows QQuickFramebufferObject. "Texture in QSGNode" is ambiguous as it suggests another type of use case (where an existing texture is imported and used with the QQ scene - without rendering to it). This would conflict with upcoming future examples, so rename to fboitem, which is what this example is about. The link from examples.qdoc is already using the fitting title so that will just work. Change-Id: Ide7a563398a4b464c55f14e10fa9386432b3d06d Reviewed-by: Andy Nichols --- .../doc/images/fboitem-example.jpg} | Bin .../doc/src/fboitem.qdoc} | 4 ++-- .../fboinsgrenderer.cpp | 0 .../{textureinsgnode => fboitem}/fboinsgrenderer.h | 0 .../textureinsgnode.pro => fboitem/fboitem.pro} | 4 ++-- .../textureinsgnode.qrc => fboitem/fboitem.qrc} | 2 +- .../{textureinsgnode => fboitem}/main.cpp | 2 +- .../{textureinsgnode => fboitem}/main.qml | 0 examples/quick/scenegraph/scenegraph.pro | 2 +- 9 files changed, 7 insertions(+), 7 deletions(-) rename examples/quick/scenegraph/{textureinsgnode/doc/images/textureinsgnode-example.jpg => fboitem/doc/images/fboitem-example.jpg} (100%) rename examples/quick/scenegraph/{textureinsgnode/doc/src/textureinsgnode.qdoc => fboitem/doc/src/fboitem.qdoc} (94%) rename examples/quick/scenegraph/{textureinsgnode => fboitem}/fboinsgrenderer.cpp (100%) rename examples/quick/scenegraph/{textureinsgnode => fboitem}/fboinsgrenderer.h (100%) rename examples/quick/scenegraph/{textureinsgnode/textureinsgnode.pro => fboitem/fboitem.pro} (69%) rename examples/quick/scenegraph/{textureinsgnode/textureinsgnode.qrc => fboitem/fboitem.qrc} (53%) rename examples/quick/scenegraph/{textureinsgnode => fboitem}/main.cpp (97%) rename examples/quick/scenegraph/{textureinsgnode => fboitem}/main.qml (100%) diff --git a/examples/quick/scenegraph/textureinsgnode/doc/images/textureinsgnode-example.jpg b/examples/quick/scenegraph/fboitem/doc/images/fboitem-example.jpg similarity index 100% rename from examples/quick/scenegraph/textureinsgnode/doc/images/textureinsgnode-example.jpg rename to examples/quick/scenegraph/fboitem/doc/images/fboitem-example.jpg diff --git a/examples/quick/scenegraph/textureinsgnode/doc/src/textureinsgnode.qdoc b/examples/quick/scenegraph/fboitem/doc/src/fboitem.qdoc similarity index 94% rename from examples/quick/scenegraph/textureinsgnode/doc/src/textureinsgnode.qdoc rename to examples/quick/scenegraph/fboitem/doc/src/fboitem.qdoc index c1c830338b..b5add02991 100644 --- a/examples/quick/scenegraph/textureinsgnode/doc/src/textureinsgnode.qdoc +++ b/examples/quick/scenegraph/fboitem/doc/src/fboitem.qdoc @@ -26,11 +26,11 @@ ****************************************************************************/ /*! - \example scenegraph/textureinsgnode + \example scenegraph/fboitem \title Scene Graph - Rendering FBOs \ingroup qtquickexamples \brief Shows how to use FramebufferObjects with Qt Quick. - \image textureinsgnode-example.jpg + \image fboitem-example.jpg */ diff --git a/examples/quick/scenegraph/textureinsgnode/fboinsgrenderer.cpp b/examples/quick/scenegraph/fboitem/fboinsgrenderer.cpp similarity index 100% rename from examples/quick/scenegraph/textureinsgnode/fboinsgrenderer.cpp rename to examples/quick/scenegraph/fboitem/fboinsgrenderer.cpp diff --git a/examples/quick/scenegraph/textureinsgnode/fboinsgrenderer.h b/examples/quick/scenegraph/fboitem/fboinsgrenderer.h similarity index 100% rename from examples/quick/scenegraph/textureinsgnode/fboinsgrenderer.h rename to examples/quick/scenegraph/fboitem/fboinsgrenderer.h diff --git a/examples/quick/scenegraph/textureinsgnode/textureinsgnode.pro b/examples/quick/scenegraph/fboitem/fboitem.pro similarity index 69% rename from examples/quick/scenegraph/textureinsgnode/textureinsgnode.pro rename to examples/quick/scenegraph/fboitem/fboitem.pro index 238e20a553..e40e5f4cf8 100644 --- a/examples/quick/scenegraph/textureinsgnode/textureinsgnode.pro +++ b/examples/quick/scenegraph/fboitem/fboitem.pro @@ -7,9 +7,9 @@ INCLUDEPATH += ../shared HEADERS += ../shared/logorenderer.h SOURCES += ../shared/logorenderer.cpp -RESOURCES += textureinsgnode.qrc +RESOURCES += fboitem.qrc -target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/textureinsgnode +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/fboitem INSTALLS += target OTHER_FILES += \ diff --git a/examples/quick/scenegraph/textureinsgnode/textureinsgnode.qrc b/examples/quick/scenegraph/fboitem/fboitem.qrc similarity index 53% rename from examples/quick/scenegraph/textureinsgnode/textureinsgnode.qrc rename to examples/quick/scenegraph/fboitem/fboitem.qrc index 9ecf0ada1c..9d9db70654 100644 --- a/examples/quick/scenegraph/textureinsgnode/textureinsgnode.qrc +++ b/examples/quick/scenegraph/fboitem/fboitem.qrc @@ -1,5 +1,5 @@ - + main.qml diff --git a/examples/quick/scenegraph/textureinsgnode/main.cpp b/examples/quick/scenegraph/fboitem/main.cpp similarity index 97% rename from examples/quick/scenegraph/textureinsgnode/main.cpp rename to examples/quick/scenegraph/fboitem/main.cpp index 8eececc0aa..429224ba95 100644 --- a/examples/quick/scenegraph/textureinsgnode/main.cpp +++ b/examples/quick/scenegraph/fboitem/main.cpp @@ -62,7 +62,7 @@ int main(int argc, char **argv) QQuickView view; view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl("qrc:///scenegraph/textureinsgnode/main.qml")); + view.setSource(QUrl("qrc:///scenegraph/fboitem/main.qml")); view.show(); return app.exec(); diff --git a/examples/quick/scenegraph/textureinsgnode/main.qml b/examples/quick/scenegraph/fboitem/main.qml similarity index 100% rename from examples/quick/scenegraph/textureinsgnode/main.qml rename to examples/quick/scenegraph/fboitem/main.qml diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index e05e1ddb44..5fea3b974a 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -5,7 +5,7 @@ qtConfig(opengl(es1|es2)?) { graph \ simplematerial \ sgengine \ - textureinsgnode \ + fboitem \ openglunderqml \ textureinthread \ twotextureproviders