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>

1 files changed, 11 insertions, 0 deletions

diff --git a/src/runtime/q3dsuippresentation.cpp b/src/runtime/q3dsuippresentation.cpp
index 0197b82..307d37a 100644
--- a/src/runtime/q3dsuippresentation.cpp
+++ b/src/runtime/q3dsuippresentation.cpp
@@ -1707,9 +1707,20 @@ void Q3DSImage::calculateTextureTransform()
 
 Q3DSPropertyChange Q3DSImage::setSourcePath(const QString &v)
 {
+    if (!m_customImage.isNull())
+        m_customImage = QImage();
+
     return createPropSetter(m_sourcePath, v, "sourcepath");
 }
 
+Q3DSPropertyChange Q3DSImage::setCustomImage(const QImage &v)
+{
+    if (!m_sourcePath.isEmpty())
+        m_sourcePath = QString();
+
+    return createPropSetter(m_customImage, v, "sourcepath");
+}
+
 Q3DSPropertyChange Q3DSImage::setScaleU(float v)
 {
     return createPropSetter(m_scaleU, v, "scaleu");