diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 12:03:20 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2009-11-09 12:03:20 (GMT) |
| commit | cf417f787454f131f35248bb0c1294dadd777b45 (patch) | |
| tree | e5ad2f54887aa695c6f66ae2c305ab75ccabdac0 /demos | |
| parent | a7577f8c3ae3a025384d8d19fdf3575ef141a70b (diff) | |
| parent | e07878a9bcccbf063650272329c0aca14290b8e3 (diff) | |
| download | Qt-cf417f787454f131f35248bb0c1294dadd777b45.zip Qt-cf417f787454f131f35248bb0c1294dadd777b45.tar.gz Qt-cf417f787454f131f35248bb0c1294dadd777b45.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt 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 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 { |