summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qgraphicssystem.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2011-03-03 16:34:32 +0100
committerOlivier Goffart <olivier.goffart@nokia.com>2011-03-03 16:34:32 +0100
commit8ddf96a15f707001755d5b934f3f900b825b5887 (patch)
tree5dee68c5bd2e691218bd45c7b74da7c7c16b22cd /src/gui/painting/qgraphicssystem.cpp
parent5414957f0feebe24a2aa0ac7c5ec32e53e49b57a (diff)
parentd7a00eaec6d94fd2383d6f815f792d26b7161f0c (diff)
Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7
Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui/painting/qgraphicssystem.cpp')
-rw-r--r--src/gui/painting/qgraphicssystem.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/painting/qgraphicssystem.cpp b/src/gui/painting/qgraphicssystem.cpp
index 8d39b59e4d..171ef46f98 100644
--- a/src/gui/painting/qgraphicssystem.cpp
+++ b/src/gui/painting/qgraphicssystem.cpp
@@ -89,4 +89,9 @@ QPixmapData *QGraphicsSystem::createPixmapData(QPixmapData *origin)
return createPixmapData(origin->pixelType());
}
+void QGraphicsSystem::releaseCachedResources()
+{
+ // Do nothing here
+}
+
QT_END_NAMESPACE