Privately export QQuickImageTextureProvider, QSGTextureMaterialShader

Without this, it becomes very difficult to reimplement
updatePaintNode when subclassing QQuickImage

Change-Id: Ib5decca3584c89ea4ab793367b63ca70a4267c87
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

3 files changed, 36 insertions, 34 deletions

diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp
index 49e5b7b1fa..2b71ad5f52 100644
--- a/src/quick/items/qquickimage.cpp
+++ b/src/quick/items/qquickimage.cpp
@@ -52,42 +52,28 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickImageTextureProvider : public QSGTextureProvider
+QQuickImageTextureProvider::QQuickImageTextureProvider()
+    : m_texture(nullptr)
+    , m_smooth(false)
 {
-    Q_OBJECT
-public:
-    QQuickImageTextureProvider()
-        : m_texture(nullptr)
-        , m_smooth(false)
-    {
-    }
+}
 
-    void updateTexture(QSGTexture *texture) {
-        if (m_texture == texture)
-            return;
-        m_texture = texture;
-        emit textureChanged();
-    }
+void QQuickImageTextureProvider::updateTexture(QSGTexture *texture) {
+    if (m_texture == texture)
+        return;
+    m_texture = texture;
+    emit textureChanged();
+}
 
-    QSGTexture *texture() const override {
-        if (m_texture) {
-            m_texture->setFiltering(m_smooth ? QSGTexture::Linear : QSGTexture::Nearest);
-            m_texture->setMipmapFiltering(m_mipmap ? QSGTexture::Linear : QSGTexture::None);
-            m_texture->setHorizontalWrapMode(QSGTexture::ClampToEdge);
-            m_texture->setVerticalWrapMode(QSGTexture::ClampToEdge);
-        }
-        return m_texture;
+QSGTexture *QQuickImageTextureProvider::texture() const {
+    if (m_texture) {
+        m_texture->setFiltering(m_smooth ? QSGTexture::Linear : QSGTexture::Nearest);
+        m_texture->setMipmapFiltering(m_mipmap ? QSGTexture::Linear : QSGTexture::None);
+        m_texture->setHorizontalWrapMode(QSGTexture::ClampToEdge);
+        m_texture->setVerticalWrapMode(QSGTexture::ClampToEdge);
     }
-
-    friend class QQuickImage;
-
-    QSGTexture *m_texture;
-    bool m_smooth;
-    bool m_mipmap;
-};
-
-#include "qquickimage.moc"
-#include "moc_qquickimage_p.cpp"
+    return m_texture;
+}
 
 QQuickImagePrivate::QQuickImagePrivate()
     : fillMode(QQuickImage::Stretch)
diff --git a/src/quick/items/qquickimage_p_p.h b/src/quick/items/qquickimage_p_p.h
index afc33def0f..e2c467c311 100644
--- a/src/quick/items/qquickimage_p_p.h
+++ b/src/quick/items/qquickimage_p_p.h
@@ -53,10 +53,26 @@
 
 #include "qquickimagebase_p_p.h"
 #include "qquickimage_p.h"
+#include <QtQuick/qsgtextureprovider.h>
 
 QT_BEGIN_NAMESPACE
 
-class QQuickImageTextureProvider;
+class Q_QUICK_PRIVATE_EXPORT QQuickImageTextureProvider : public QSGTextureProvider
+{
+    Q_OBJECT
+public:
+    QQuickImageTextureProvider();
+
+    void updateTexture(QSGTexture *texture);
+
+    QSGTexture *texture() const override ;
+
+    friend class QQuickImage;
+
+    QSGTexture *m_texture;
+    bool m_smooth;
+    bool m_mipmap;
+};
 
 class Q_QUICK_PRIVATE_EXPORT QQuickImagePrivate : public QQuickImageBasePrivate
 {
diff --git a/src/quick/scenegraph/util/qsgtexturematerial_p.h b/src/quick/scenegraph/util/qsgtexturematerial_p.h
index 093d820801..a99e872580 100644
--- a/src/quick/scenegraph/util/qsgtexturematerial_p.h
+++ b/src/quick/scenegraph/util/qsgtexturematerial_p.h
@@ -72,7 +72,7 @@ protected:
     int m_matrix_id;
 };
 
-class QSGTextureMaterialShader : public QSGOpaqueTextureMaterialShader
+class Q_QUICK_PRIVATE_EXPORT QSGTextureMaterialShader : public QSGOpaqueTextureMaterialShader
 {
 public:
     QSGTextureMaterialShader();