diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-29 16:07:26 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2011-04-29 16:07:26 (GMT) |
| commit | e4de914405880c90298eae1115d39618384758e4 (patch) | |
| tree | 247c2be71f35a3967ab87e49f2ff20ce0531caa8 /src/gui/image/qpixmap.cpp | |
| parent | 7aa4ecdedba60ac4cbc07a774ae9d834677002e9 (diff) | |
| parent | ab29e9f1ab52901a5ed98055cf203817d2248dd2 (diff) | |
| download | Qt-e4de914405880c90298eae1115d39618384758e4.zip Qt-e4de914405880c90298eae1115d39618384758e4.tar.gz Qt-e4de914405880c90298eae1115d39618384758e4.tar.bz2 | |
Merge remote-tracking branch 'origin/4.8' into HEAD
Diffstat (limited to 'src/gui/image/qpixmap.cpp')
| -rw-r--r-- | src/gui/image/qpixmap.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 34804e5..c34f6ac 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -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; } |