Port QtExtras.QImageItem to Qt5, enable build

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

src/declarativeimports/qtextracomponents/qimageitem.cpp

@@ -22,12 +22,12 @@
 #include <QPainter>
 
 
-QImageItem::QImageItem(QDeclarativeItem *parent)
+QImageItem::QImageItem(QQuickItem *parent)
-    : QDeclarativeItem(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;
     }

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;