From a283134b3e5b1aa35a93eac0b4382e431dd3bd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= <sebas@kde.org>
Date: Fri, 15 Feb 2013 00:20:01 +0100
Subject: [PATCH] Port QtExtras.QImageItem to Qt5, enable build

---
 .../qtextracomponents/CMakeLists.txt                  |  2 +-
 .../qtextracomponents/qimageitem.cpp                  | 11 ++++-------
 src/declarativeimports/qtextracomponents/qimageitem.h |  6 +++---
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/declarativeimports/qtextracomponents/CMakeLists.txt b/src/declarativeimports/qtextracomponents/CMakeLists.txt
index 81291d0c4..1c05f5351 100644
--- a/src/declarativeimports/qtextracomponents/CMakeLists.txt
+++ b/src/declarativeimports/qtextracomponents/CMakeLists.txt
@@ -7,7 +7,7 @@ add_subdirectory(tests)
 set(qtextracomponents_SRCS
     qtextracomponentsplugin.cpp
     qpixmapitem.cpp
-#     qimageitem.cpp
+    qimageitem.cpp
     qiconitem.cpp
     mouseeventlistener.cpp
     columnproxymodel.cpp
diff --git a/src/declarativeimports/qtextracomponents/qimageitem.cpp b/src/declarativeimports/qtextracomponents/qimageitem.cpp
index dc28ee5ee..ed206055c 100644
--- a/src/declarativeimports/qtextracomponents/qimageitem.cpp
+++ b/src/declarativeimports/qtextracomponents/qimageitem.cpp
@@ -22,12 +22,12 @@
 #include <QPainter>
 
 
-QImageItem::QImageItem(QDeclarativeItem *parent)
-    : QDeclarativeItem(parent),
+QImageItem::QImageItem(QQuickItem *parent)
+    : QQuickPaintedItem(parent),
       m_smooth(false),
       m_fillMode(QImageItem::Stretch)
 {
-    setFlag(QGraphicsItem::ItemHasNoContents, false);
+    setFlag(ItemHasContents, true);
 }
 
 
@@ -93,11 +93,8 @@ void QImageItem::setFillMode(QImageItem::FillMode mode)
     emit fillModeChanged();
 }
 
-void QImageItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void QImageItem::paint(QPainter *painter)
 {
-    Q_UNUSED(option);
-    Q_UNUSED(widget);
-
     if (m_image.isNull()) {
         return;
     }
diff --git a/src/declarativeimports/qtextracomponents/qimageitem.h b/src/declarativeimports/qtextracomponents/qimageitem.h
index d12ecdf0e..eef59bcf8 100644
--- a/src/declarativeimports/qtextracomponents/qimageitem.h
+++ b/src/declarativeimports/qtextracomponents/qimageitem.h
@@ -19,10 +19,10 @@
 #ifndef QIMAGEITEM_H
 #define QIMAGEITEM_H
 
-#include <QQuickItem>
+#include <QQuickPaintedItem>
 #include <QImage>
 
-class QImageItem : public QQuickItem
+class QImageItem : public QQuickPaintedItem
 {
     Q_OBJECT
 
@@ -59,7 +59,7 @@ public:
     FillMode fillMode() const;
     void setFillMode(FillMode mode);
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void paint(QPainter *painter);
 
     bool isNull() const;