diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-11-11 09:33:57 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-11-11 09:33:57 (GMT) |
| commit | 6855df6110eebdbfc43211f20dd65f446ccda209 (patch) | |
| tree | dd731afb046463a7dcbe249f7ea9de0484195b2a /demos | |
| parent | 835a23891567831cf184e5bbaba8d00bfc912699 (diff) | |
| parent | 95db13345cd7b6b7cac8725fe2879aaf80233818 (diff) | |
| download | Qt-6855df6110eebdbfc43211f20dd65f446ccda209.zip Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.gz Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.bz2 | |
Merge remote branch 'qt/4.6' into kinetic-declarativeui
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 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 { |