diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 21:36:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-25 21:36:02 (GMT) |
| commit | 01550804c1fdb042b8b58528f716888e729be868 (patch) | |
| tree | d64f4936c42e3d675ac9663ceb956c2b992efac4 | |
| parent | 187baf3b5e4fe8926bb70ee4e6e868ccc51d4514 (diff) | |
| parent | 4731474fbe798d9deab9ba462f9a483253704506 (diff) | |
| download | Qt-01550804c1fdb042b8b58528f716888e729be868.zip Qt-01550804c1fdb042b8b58528f716888e729be868.tar.gz Qt-01550804c1fdb042b8b58528f716888e729be868.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Update changelog
Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucent widge in multi-screen environment
| -rw-r--r-- | dist/changes-4.8.0 | 2 | ||||
| -rw-r--r-- | src/gui/painting/qwindowsurface_x11.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index f8ca4bc..c55faf6 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -37,6 +37,8 @@ Third party components QtCore ------ - Removed support for QT_NO_THREAD define for QHostInfo. + - Optimized plugin loading on ELF platforms. + Print failure reason at runtime with QT_DEBUG_PLUGINS=1 in environment. QtGui ----- diff --git a/src/gui/painting/qwindowsurface_x11.cpp b/src/gui/painting/qwindowsurface_x11.cpp index cadf264..d7f54ea 100644 --- a/src/gui/painting/qwindowsurface_x11.cpp +++ b/src/gui/painting/qwindowsurface_x11.cpp @@ -149,6 +149,8 @@ void QX11WindowSurface::setGeometry(const QRect &rect) return; #ifndef QT_NO_XRENDER if (d_ptr->translucentBackground) { + QPixmap::x11SetDefaultScreen(d_ptr->widget->x11Info().screen()); + QX11PixmapData *data = new QX11PixmapData(QPixmapData::PixmapType); data->xinfo = d_ptr->widget->x11Info(); data->resize(size.width(), size.height()); |