diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 11:38:17 (GMT) |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2009-11-09 11:38:17 (GMT) |
| commit | e9a06e6f9765c9632103c86fe190e8154ce4a9f8 (patch) | |
| tree | cc9fc9c931423674081b6ab843d22bc643a5df64 /src/gui/kernel/qwidget_x11.cpp | |
| parent | 00aeefeeaff4d8c3e25c6f388c5e51c239541f87 (diff) | |
| parent | a2a3adf7de2ffc9784fea177a43f3124862a992a (diff) | |
| download | Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.zip Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.gz Qt-e9a06e6f9765c9632103c86fe190e8154ce4a9f8.tar.bz2 | |
Merge branch '4.6-api-review' into 4.6
Diffstat (limited to 'src/gui/kernel/qwidget_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index 28676da..7461637 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -1445,7 +1445,7 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset) icon_data[pos++] = image.width(); icon_data[pos++] = image.height(); if (sizeof(long) == sizeof(quint32)) { - memcpy(icon_data.data() + pos, image.scanLine(0), image.numBytes()); + memcpy(icon_data.data() + pos, image.scanLine(0), image.byteCount()); } else { for (int y = 0; y < image.height(); ++y) { uint *scanLine = reinterpret_cast<uint *>(image.scanLine(y)); |