diff options
author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 06:31:45 (GMT) |
---|---|---|
committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 06:36:05 (GMT) |
commit | 2e645960930442e895f887f1ef5e226d14eabcc7 (patch) | |
tree | c2b1586944d02e392cbc16251bbc232f5cf142a2 /src/gui/kernel/qwidget_x11.cpp | |
parent | 9093368f33ddc422047103a89effcd40338b4dbc (diff) | |
download | Qt-2e645960930442e895f887f1ef5e226d14eabcc7.zip Qt-2e645960930442e895f887f1ef5e226d14eabcc7.tar.gz Qt-2e645960930442e895f887f1ef5e226d14eabcc7.tar.bz2 |
More qpixmap*.cpp fixes for QExplicitlySharedDataPointer.
Hopefully this fixes the remaining issues.
Diffstat (limited to 'src/gui/kernel/qwidget_x11.cpp')
-rw-r--r-- | src/gui/kernel/qwidget_x11.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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(); } } } |