Merge remote-tracking branch 'gerrit/5.11' into wip/webassembly

Change-Id: I729af792166fd2f6c5843ba564e63adf8ae09a97

1 files changed, 18 insertions, 3 deletions

diff --git a/src/quick/scenegraph/util/qsgtexturereader_p.h b/src/quick/scenegraph/util/qsgtexturereader_p.h
index 7d2fc314a6..19e33bf5c3 100644
--- a/src/quick/scenegraph/util/qsgtexturereader_p.h
+++ b/src/quick/scenegraph/util/qsgtexturereader_p.h
@@ -52,19 +52,34 @@
 //
 
 #include <QString>
+#include <QFileInfo>
 
 QT_BEGIN_NAMESPACE
 
 class QIODevice;
 class QQuickTextureFactory;
+class QSGTextureFileHandler;
 
 class QSGTextureReader
 {
 public:
-    QSGTextureReader();
+    QSGTextureReader(QIODevice *device, const QString &fileName = QString());
+    ~QSGTextureReader();
 
-    static QQuickTextureFactory *read(QIODevice *device, const QByteArray &format);
-    static bool isTexture(QIODevice *device, const QByteArray &format);
+    QQuickTextureFactory *read();
+    bool isTexture();
+
+    // TBD access function to params
+    // TBD ask for identified fmt
+
+    static QList<QByteArray> supportedFileFormats();
+
+private:
+    bool init();
+    QIODevice *m_device = nullptr;
+    QFileInfo m_fileInfo;
+    QSGTextureFileHandler *m_handler = nullptr;
+    bool checked = false;
 };
 
 QT_END_NAMESPACE