Make it possible to create QTextureFileData from images

Currently it is only possible to create a cube map texture from a single
compressed texture file. In many cases, the cubemap asset is available
as a set of individual image files. Making it possible to use these
images directly will make the development process more efficient, and
will reduce the size of the assets needed to be shipped with demos and
examples.

Task-number: QTBUG-103191
Change-Id: Icd12548e2dab55ec2123804cb28353cbf29926ce
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/gui/util/qtexturefiledata_p.h b/src/gui/util/qtexturefiledata_p.h
index 189a590979..cd0dbe171c 100644
--- a/src/gui/util/qtexturefiledata_p.h
+++ b/src/gui/util/qtexturefiledata_p.h
@@ -30,7 +30,9 @@ class QTextureFileDataPrivate;
 class Q_GUI_EXPORT QTextureFileData
 {
 public:
-    QTextureFileData();
+    enum Mode { ByteArrayMode, ImageMode };
+
+    QTextureFileData(Mode mode = ByteArrayMode);
     QTextureFileData(const QTextureFileData &other);
     QTextureFileData &operator=(const QTextureFileData &other);
     ~QTextureFileData();
@@ -42,6 +44,7 @@ public:
 
     QByteArray data() const;
     void setData(const QByteArray &data);
+    void setData(const QImage &image, int level = 0, int face = 0);
 
     int dataOffset(int level = 0, int face = 0) const;
     void setDataOffset(int offset, int level = 0, int face = 0);
@@ -77,6 +80,7 @@ public:
 
 private:
     QSharedDataPointer<QTextureFileDataPrivate> d;
+    friend Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QTextureFileData &d);
 };
 
 Q_DECLARE_TYPEINFO(QTextureFileData, Q_RELOCATABLE_TYPE);