From 98f067c9499c1010a0332f541f7aa4a69d241659 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 1 Apr 2020 20:25:54 +0000 Subject: [PATCH] handle formats as exclusive in QX11Data::xdndMimeAtomsForFormat() Signed-off-by: Ivailo Monev --- src/gui/kernel/qdnd_x11.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index 467b2628d..1639bf5a6 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -543,18 +543,15 @@ QList QX11Data::xdndMimeAtomsForFormat(const QString &format) atoms.append(XA_STRING); atoms.append(ATOM(TEXT)); atoms.append(ATOM(COMPOUND_TEXT)); - } - // special cases for uris - if (format == QLatin1String("text/uri-list")) { + } else if (format == QLatin1String("text/uri-list")) { atoms.append(xdndMimeStringToAtom(QLatin1String("text/x-moz-url"))); - } - //special cases for images - if (format == QLatin1String("image/ppm")) + } else if (format == QLatin1String("image/ppm")) { atoms.append(XA_PIXMAP); - if (format == QLatin1String("image/pbm")) + } else if (format == QLatin1String("image/pbm")) { atoms.append(XA_BITMAP); + } return atoms; }