summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolaos Korkakakis <nikolaos.korkakakis@diasemi.com>2011-07-26 14:32:46 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-07-26 14:34:20 (GMT)
commit07565b925cb92f9d28ae4586f112e0ed52d2c451 (patch)
tree513102874c990a1eb089052d189ca127ad8e56cd
parent2fa986aa670bee0fafb30241f40bb3556594e32b (diff)
downloadQt-07565b925cb92f9d28ae4586f112e0ed52d2c451.zip
Qt-07565b925cb92f9d28ae4586f112e0ed52d2c451.tar.gz
Qt-07565b925cb92f9d28ae4586f112e0ed52d2c451.tar.bz2
OpenVG cleanup.
Changes needed to reflect the updates in the QWindowSurface. Merge-request: 1309 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/openvg/qwindowsurface_vg.cpp7
-rw-r--r--src/openvg/qwindowsurface_vg_p.h6
2 files changed, 13 insertions, 0 deletions
diff --git a/src/openvg/qwindowsurface_vg.cpp b/src/openvg/qwindowsurface_vg.cpp
index 778e14c..2935316 100644
--- a/src/openvg/qwindowsurface_vg.cpp
+++ b/src/openvg/qwindowsurface_vg.cpp
@@ -93,10 +93,17 @@ void QVGWindowSurface::flush(QWidget *widget, const QRegion &region, const QPoin
d_ptr->endPaint(parent, region);
}
+#if !defined(Q_WS_QPA)
void QVGWindowSurface::setGeometry(const QRect &rect)
{
QWindowSurface::setGeometry(rect);
}
+#else
+void QVGWindowSurface::resize(const QSize &size)
+{
+ QWindowSurface::resize(size);
+}
+#endif //!Q_WS_QPA
bool QVGWindowSurface::scroll(const QRegion &area, int dx, int dy)
{
diff --git a/src/openvg/qwindowsurface_vg_p.h b/src/openvg/qwindowsurface_vg_p.h
index 4ce73eb..b5c6da3 100644
--- a/src/openvg/qwindowsurface_vg_p.h
+++ b/src/openvg/qwindowsurface_vg_p.h
@@ -70,7 +70,13 @@ public:
QPaintDevice *paintDevice();
void flush(QWidget *widget, const QRegion &region, const QPoint &offset);
+
+#if !defined(Q_WS_QPA)
void setGeometry(const QRect &rect);
+#else
+ void resize(const QSize &size);
+#endif
+
bool scroll(const QRegion &area, int dx, int dy);
void beginPaint(const QRegion &region);