Prefix internal classes properly and private export them.

Without the private export on these classes, the private
export on the QSGDefaultImageNode and QSGDefaultTextureNode
is useless, as the symbols fail to resolve

Change-Id: I25a265a7669e5f5015c482aa24fe154c2c9a1062
Reviewed-by: Alan Alpert <aalpert@blackberry.com>

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 6d327b8..866d678 100644 (file)
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -286,8 +286,8 @@ void QSGContext::precompileMaterials()
         QSG_PRECOMPILE_MATERIAL(QSGFlatColorMaterial);
         QSG_PRECOMPILE_MATERIAL(QSGOpaqueTextureMaterial);
         QSG_PRECOMPILE_MATERIAL(QSGTextureMaterial);
-        QSG_PRECOMPILE_MATERIAL(SmoothTextureMaterial);
-        QSG_PRECOMPILE_MATERIAL(SmoothColorMaterial);
+        QSG_PRECOMPILE_MATERIAL(QSGSmoothTextureMaterial);
+        QSG_PRECOMPILE_MATERIAL(QSGSmoothColorMaterial);
         QSG_PRECOMPILE_MATERIAL(QSGDistanceFieldTextMaterial);
     }
 }

diff --git a/src/quick/scenegraph/qsgdefaultimagenode.cpp b/src/quick/scenegraph/qsgdefaultimagenode.cpp
index cadd18e..aed6991 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultimagenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultimagenode.cpp
@@ -87,24 +87,24 @@ protected:
 };
 
 
-SmoothTextureMaterial::SmoothTextureMaterial()
+QSGSmoothTextureMaterial::QSGSmoothTextureMaterial()
 {
     setFlag(RequiresFullMatrixExceptTranslate, true);
     setFlag(Blending, true);
 }
 
-void SmoothTextureMaterial::setTexture(QSGTexture *texture)
+void QSGSmoothTextureMaterial::setTexture(QSGTexture *texture)
 {
     m_texture = texture;
 }
 
-QSGMaterialType *SmoothTextureMaterial::type() const
+QSGMaterialType *QSGSmoothTextureMaterial::type() const
 {
     static QSGMaterialType type;
     return &type;
 }
 
-QSGMaterialShader *SmoothTextureMaterial::createShader() const
+QSGMaterialShader *QSGSmoothTextureMaterial::createShader() const
 {
     return new SmoothTextureMaterialShader;
 }

diff --git a/src/quick/scenegraph/qsgdefaultimagenode_p.h b/src/quick/scenegraph/qsgdefaultimagenode_p.h
index d7be5f7..723943f 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultimagenode_p.h
+++ b/src/quick/scenegraph/qsgdefaultimagenode_p.h
@@ -48,10 +48,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class SmoothTextureMaterial : public QSGTextureMaterial
+class Q_QUICK_PRIVATE_EXPORT QSGSmoothTextureMaterial : public QSGTextureMaterial
 {
 public:
-    SmoothTextureMaterial();
+    QSGSmoothTextureMaterial();
 
     void setTexture(QSGTexture *texture);
 
@@ -90,7 +90,7 @@ private:
 
     QSGOpaqueTextureMaterial m_material;
     QSGTextureMaterial m_materialO;
-    SmoothTextureMaterial m_smoothMaterial;
+    QSGSmoothTextureMaterial m_smoothMaterial;
 
     uint m_antialiasing : 1;
     uint m_mirror : 1;

diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode.cpp b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
index f642ca8..76fbbb4 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultrectanglenode.cpp
@@ -211,24 +211,24 @@ const char *SmoothColorMaterialShader::fragmentShader() const
             "}";
 }
 
-SmoothColorMaterial::SmoothColorMaterial()
+QSGSmoothColorMaterial::QSGSmoothColorMaterial()
 {
     setFlag(RequiresFullMatrixExceptTranslate, true);
     setFlag(Blending, true);
 }
 
-int SmoothColorMaterial::compare(const QSGMaterial *) const
+int QSGSmoothColorMaterial::compare(const QSGMaterial *) const
 {
     return 0;
 }
 
-QSGMaterialType *SmoothColorMaterial::type() const
+QSGMaterialType *QSGSmoothColorMaterial::type() const
 {
     static QSGMaterialType type;
     return &type;
 }
 
-QSGMaterialShader *SmoothColorMaterial::createShader() const
+QSGMaterialShader *QSGSmoothColorMaterial::createShader() const
 {
     return new SmoothColorMaterialShader;
 }

diff --git a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
index 9ca8a96..1994e01 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
+++ b/src/quick/scenegraph/qsgdefaultrectanglenode_p.h
@@ -51,10 +51,10 @@ QT_BEGIN_NAMESPACE
 
 class QSGContext;
 
-class SmoothColorMaterial : public QSGMaterial
+class Q_QUICK_PRIVATE_EXPORT QSGSmoothColorMaterial : public QSGMaterial
 {
 public:
-    SmoothColorMaterial();
+    QSGSmoothColorMaterial();
 
     int compare(const QSGMaterial *other) const;
 
@@ -83,7 +83,7 @@ private:
     void updateGradientTexture();
 
     QSGVertexColorMaterial m_material;
-    SmoothColorMaterial m_smoothMaterial;
+    QSGSmoothColorMaterial m_smoothMaterial;
 
     QRectF m_rect;
     QGradientStops m_gradient_stops;