summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-12-15 16:20:18 +0100
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-12-15 16:21:45 +0100
commitfa689a24fbf9524059ebce5436b408eed31ab7f5 (patch)
treec58b161c900a6126409716dc83c0a5699f004e86
parentc9bc62ea78f6d75768213c5859df85facc667748 (diff)
Export the XxxxNodeInterface classes
also fix one small bug Reviewed-by: Gunnar
-rw-r--r--src/adaptationlayers/adaptationlayer.h6
-rw-r--r--src/graphicsitems/qximagebase.cpp1
2 files changed, 4 insertions, 3 deletions
diff --git a/src/adaptationlayers/adaptationlayer.h b/src/adaptationlayers/adaptationlayer.h
index eb2ca68..5e42351 100644
--- a/src/adaptationlayers/adaptationlayer.h
+++ b/src/adaptationlayers/adaptationlayer.h
@@ -58,7 +58,7 @@ class TextureReference;
// TODO: Rename from XInterface to AbstractX.
-class RectangleNodeInterface : public GeometryNode
+class QT_SCENEGRAPH_EXPORT RectangleNodeInterface : public GeometryNode
{
public:
RectangleNodeInterface() : m_radius(0), m_opacity(1), m_pen_width(0) { }
@@ -94,7 +94,7 @@ protected:
int m_pen_width;
};
-class TextureNodeInterface : public GeometryNode
+class QT_SCENEGRAPH_EXPORT TextureNodeInterface : public GeometryNode
{
public:
TextureNodeInterface() : m_texture(0), m_opacity(1), m_clamp_to_edge(true), m_linear_filtering(false) { }
@@ -153,7 +153,7 @@ protected:
//};
-class GlyphNodeInterface: public GeometryNode
+class QT_SCENEGRAPH_EXPORT GlyphNodeInterface: public GeometryNode
{
public:
GlyphNodeInterface() : m_opacity(1.0) {}
diff --git a/src/graphicsitems/qximagebase.cpp b/src/graphicsitems/qximagebase.cpp
index 81ef269..e03a164 100644
--- a/src/graphicsitems/qximagebase.cpp
+++ b/src/graphicsitems/qximagebase.cpp
@@ -238,6 +238,7 @@ void QxImageBase::markDirty(int flag)
d->dirty |= flag;
if (!d->connected) {
connect(QSGContext::current, SIGNAL(aboutToRenderNextFrame()), this, SLOT(prepare()));
+ d->connected = true;
}
}