Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Change-Id: I0af7b0c3e0a21aae68c82ec11c5ca579c1661ce9

1 files changed, 4 insertions, 0 deletions

diff --git a/examples/quick/textureprovider/main.cpp b/examples/quick/textureprovider/main.cpp
index ea4f73127d..f92d34ada5 100644
--- a/examples/quick/textureprovider/main.cpp
+++ b/examples/quick/textureprovider/main.cpp
@@ -48,6 +48,10 @@ int main(int argc, char* argv[])
     QGuiApplication app(argc,argv);
     QQuickView view;
 
+    /*
+          NOTE: ETC compressed textures in PKM files are supported out-of-the-box since Qt 5.10.
+          However, we retain this example to show how custom texture providers can be integrated.
+    */
     EtcProvider *provider = new EtcProvider();
     provider->setBaseUrl(QUrl("qrc:///textureprovider/"));
     view.engine()->addImageProvider("etc", provider);