diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 06:53:15 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 06:53:15 (GMT) |
| commit | 95fdaca180de22df158ac54a282ef48e224d0e0a (patch) | |
| tree | e92fd5650db58195b67906fc88c2275b145231c8 | |
| parent | c6587e8dfe26744ca30dc52f9871b57643f1bb36 (diff) | |
| parent | 2e645960930442e895f887f1ef5e226d14eabcc7 (diff) | |
| download | Qt-95fdaca180de22df158ac54a282ef48e224d0e0a.zip Qt-95fdaca180de22df158ac54a282ef48e224d0e0a.tar.gz Qt-95fdaca180de22df158ac54a282ef48e224d0e0a.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/gui/image/qpixmap_mac.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp index d1ec3d8..4aa74f7 100644 --- a/src/gui/image/qpixmap_mac.cpp +++ b/src/gui/image/qpixmap_mac.cpp @@ -1106,7 +1106,7 @@ void QMacPixmapData::copy(const QPixmapData *data, const QRect &rect) return; } - const QMacPixmapData *macData = static_cast<const QMacPixmapData*>(data.constData()); + const QMacPixmapData *macData = static_cast<const QMacPixmapData*>(data); resize(rect.width(), rect.height()); diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp index 8baebe8..5e3897b 100644 --- a/src/gui/kernel/qwidget_x11.cpp +++ b/src/gui/kernel/qwidget_x11.cpp @@ -1280,7 +1280,7 @@ void QWidgetPrivate::updateSystemBackground() else if (brush.style() == Qt::TexturePattern) { extern QPixmap qt_toX11Pixmap(const QPixmap &pixmap); // qpixmap_x11.cpp XSetWindowBackgroundPixmap(X11->display, q->internalWinId(), - static_cast<QX11PixmapData*>(qt_toX11Pixmap(brush.texture()).data)->x11ConvertToDefaultDepth()); + static_cast<QX11PixmapData*>(qt_toX11Pixmap(brush.texture()).data.data())->x11ConvertToDefaultDepth()); } else XSetWindowBackground(X11->display, q->internalWinId(), QColormap::instance(xinfo.screen()).pixel(brush.color())); @@ -1426,7 +1426,7 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset) // violates the ICCCM), since this works on all DEs known to Qt if (!forceReset || !topData->iconPixmap) topData->iconPixmap = new QPixmap(qt_toX11Pixmap(icon.pixmap(QSize(64,64)))); - pixmap_handle = static_cast<QX11PixmapData*>(topData->iconPixmap->data)->x11ConvertToDefaultDepth(); + pixmap_handle = static_cast<QX11PixmapData*>(topData->iconPixmap->data.data())->x11ConvertToDefaultDepth(); } } } |