diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-29 10:08:13 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-29 10:08:13 (GMT) |
| commit | c2a68020e7c6d50197e8f3f65186845fee91f3db (patch) | |
| tree | f6a914d648858ea6069b87e48a3aec8d6ad48305 /src/opengl/qgl_x11.cpp | |
| parent | 0f7ba7f6d1333139395a06a1b679db6368bf8dfa (diff) | |
| parent | 4d35d5a997d873d7be4d453651219ab9b680e9fa (diff) | |
| download | Qt-c2a68020e7c6d50197e8f3f65186845fee91f3db.zip Qt-c2a68020e7c6d50197e8f3f65186845fee91f3db.tar.gz Qt-c2a68020e7c6d50197e8f3f65186845fee91f3db.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'src/opengl/qgl_x11.cpp')
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index f3a4c95..7f4c670 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1776,6 +1776,10 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pixmap, cons QX11PixmapData *pixmapData = static_cast<QX11PixmapData*>(pixmap->data_ptr().data()); Q_ASSERT(pixmapData->classId() == QPixmapData::X11Class); + // We can't use TFP if the pixmap has a separate X11 mask + if (pixmapData->x11_mask) + return 0; + if (!qt_resolveTextureFromPixmap(paintDevice)) return 0; |