diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 12:38:17 +0100 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 12:38:17 +0100 |
| commit | e9a06e6f9765c9632103c86fe190e8154ce4a9f8 (patch) | |
| tree | cc9fc9c931423674081b6ab843d22bc643a5df64 /demos | |
| parent | 00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (diff) | |
| parent | a2a3adf7de2ffc9784fea177a43f3124862a992a (diff) | |
Merge branch '4.6-api-review' into 4.6
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/composition/composition.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/composition/composition.cpp b/demos/composition/composition.cpp index 24e91877ea..1025d3c48f 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 { |