diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-08-06 15:39:48 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-08-07 08:22:53 +0000 |
| commit | 327a9290e120894a58e266ce35cc70d61d6e6507 (patch) | |
| tree | 21d4919665f4f2db85535ed9d64d7b57e1151d84 /src/runtime/q3dsuippresentation_p.h | |
| parent | 09c027651087e17f28cc515351aa77144bdfd4a1 (diff) | |
Add support for QImage in Q3DSImage
Also fixes changing the filename in the sourcepath property of an Image.
Change-Id: Ie805cc288ecda96cdf126ec1d611aa863cb82c48
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/runtime/q3dsuippresentation_p.h')
| -rw-r--r-- | src/runtime/q3dsuippresentation_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/runtime/q3dsuippresentation_p.h b/src/runtime/q3dsuippresentation_p.h index 448884b..53bb31c 100644 --- a/src/runtime/q3dsuippresentation_p.h +++ b/src/runtime/q3dsuippresentation_p.h @@ -55,6 +55,7 @@ #include <QVector3D> #include <QMatrix4x4> #include <QColor> +#include <QImage> #include <QVariant> #include <functional> @@ -822,6 +823,10 @@ public: Q3DSPropertyChange setPivotV(float v); Q3DSPropertyChange setSubPresentation(const QString &v); + // custom image management + Q3DSPropertyChange setCustomImage(const QImage &v); // alternative setter + QImage customImage() const { return m_customImage; } + private: Q_DISABLE_COPY(Q3DSImage) template<typename V> void setProps(const V &attrs, PropSetFlags flags); @@ -841,6 +846,7 @@ private: QMatrix4x4 m_textureTransform; bool m_hasTransparency = false; bool m_scannedForTransparency = false; + QImage m_customImage; }; class Q3DSV_PRIVATE_EXPORT Q3DSNode : public Q3DSGraphObject |