diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-05-05 08:16:00 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-05-05 09:06:50 (GMT) |
| commit | 5eef8717c9862befe8b6529cbb111c0b30529f48 (patch) | |
| tree | f21db5059713f883f59d317d4709cf137e120ae8 /src/gui/kernel/qclipboard_x11.cpp | |
| parent | 4baa045b77ef98f269bec4cab410229a89e644c5 (diff) | |
| download | Qt-5eef8717c9862befe8b6529cbb111c0b30529f48.zip Qt-5eef8717c9862befe8b6529cbb111c0b30529f48.tar.gz Qt-5eef8717c9862befe8b6529cbb111c0b30529f48.tar.bz2 | |
Fixed handling of XA_PIXMAP format type in QClipboard on X11.
When requesting image/ppm type we didn't return the proper pixmap
because type 'PIXMAP' is not a proper image format name, but a reserved
atom, so the fix is to remove redundant check that was triggered before
we entered the actual function that tries to convert the clipboard
content.
Task-number: 252501
Reviewed-by: Brad
Diffstat (limited to 'src/gui/kernel/qclipboard_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qclipboard_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp index 089cc43..d7eb111 100644 --- a/src/gui/kernel/qclipboard_x11.cpp +++ b/src/gui/kernel/qclipboard_x11.cpp @@ -786,7 +786,7 @@ static Atom send_selection(QClipboardData *d, Atom target, Window window, Atom p QByteArray data; QByteArray fmt = X11->xdndAtomToString(target); - if (fmt.isEmpty() || !QInternalMimeData::hasFormatHelper(QString::fromAscii(fmt), d->source())) { // Not a MIME type we have + if (fmt.isEmpty()) { // Not a MIME type we have DEBUG("QClipboard: send_selection(): converting to type '%s' is not supported", fmt.data()); return XNone; } |