summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-09 11:38:17 (GMT)
committerMarius Storm-Olsen <marius.storm-olsen@nokia.com>2009-11-09 11:38:17 (GMT)
commite9a06e6f9765c9632103c86fe190e8154ce4a9f8 (patch)
treecc9fc9c931423674081b6ab843d22bc643a5df64 /demos
parent00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (diff)
parenta2a3adf7de2ffc9784fea177a43f3124862a992a (diff)
downloadQt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.zip
Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.gz
Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.bz2
Merge branch '4.6-api-review' into 4.6
Diffstat (limited to 'demos')
-rw-r--r--demos/composition/composition.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp
index 24e9187..1025d3c 100644
--- a/demos/composition/composition.cpp
+++ b/demos/composition/composition.cpp
@@ -457,7 +457,7 @@ void CompositionRenderer::paint(QPainter *painter)
#ifdef Q_WS_QWS
m_buffer = m_base_buffer;
#else
- memcpy(m_buffer.bits(), m_base_buffer.bits(), m_buffer.numBytes());
+ memcpy(m_buffer.bits(), m_base_buffer.bits(), m_buffer.byteCount());
#endif
{