aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickimage.cpp
diff options
context:
space:
mode:
authorLouis du Verdier <louis.du.verdier@free.fr>2014-06-05 08:44:16 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 14:09:31 +0200
commit468a65c89eebeeb8c02cb83fe8ffd37c3e8937d2 (patch)
tree5fb2ece74d4323b17a6500b74fe8573980f69b7e /src/quick/items/qquickimage.cpp
parent8a71e2bd031230777dcfbb482af40a03b8d91507 (diff)
Optimize the way AnimatedImage display its content
Since QtQuick2, the AnimatedImage component is less efficient than it was with QtQuick1, using more CPU and RAM. This commit makes it upload when required each animation frame as a cached texture (using QQuickPixmapCache) to speed up the component. Task-number: QTBUG-38921 Change-Id: I7ab0b5f47ecec6cb3cdded0dd219d6acc1bc4148 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Diffstat (limited to 'src/quick/items/qquickimage.cpp')
-rw-r--r--src/quick/items/qquickimage.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index d7527742dc..f8323a6bc3 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -184,6 +184,17 @@ void QQuickImagePrivate::setImage(const QImage &image)
q->update();
}
+void QQuickImagePrivate::setPixmap(const QQuickPixmap &pixmap)
+{
+ Q_Q(QQuickImage);
+ pix.setPixmap(pixmap);
+
+ q->pixmapChange();
+ status = pix.isNull() ? QQuickImageBase::Null : QQuickImageBase::Ready;
+
+ q->update();
+}
+
/*!
\qmlproperty enumeration QtQuick::Image::fillMode