Removed warning from QPixmap::handle().
With the new fromX11Pixmap function there are valid use-cases where checking the handle() is useful also with the raster graphicssystem. Reviewed-by: Thiago Macieira (cherry picked from commit 1124f41253edd0e03704db72b0e1b6b4b518bd0f)bb10
parent
a759518a98
commit
4a93814a1d
|
|
@ -1224,12 +1224,8 @@ Qt::HANDLE QPixmap::handle() const
|
|||
{
|
||||
#if defined(Q_WS_X11)
|
||||
const QPixmapData *pd = pixmapData();
|
||||
if (pd) {
|
||||
if (pd->classId() == QPixmapData::X11Class)
|
||||
return static_cast<const QX11PixmapData*>(pd)->handle();
|
||||
else
|
||||
qWarning("QPixmap::handle(): Pixmap is not an X11 class pixmap");
|
||||
}
|
||||
if (pd && pd->classId() == QPixmapData::X11Class)
|
||||
return static_cast<const QX11PixmapData*>(pd)->handle();
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue