summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-05-13 10:48:22 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-05-13 11:02:34 (GMT)
commit8a7f9857350c50dc77d2a39a864b22cdaffa78ff (patch)
tree060d1cebfa8d380224f0a7225842ef76e5736daa /src/gui/kernel
parentf1d1be98036ea4d03c505d54e7adb408491434d4 (diff)
downloadQt-8a7f9857350c50dc77d2a39a864b22cdaffa78ff.zip
Qt-8a7f9857350c50dc77d2a39a864b22cdaffa78ff.tar.gz
Qt-8a7f9857350c50dc77d2a39a864b22cdaffa78ff.tar.bz2
Fix warning
Reviewed-by: Denis
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qdnd_x11.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index ed93b34..9b2305d 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -543,7 +543,7 @@ bool QX11Data::xdndMimeDataForAtom(Atom a, QMimeData *mimeData, QByteArray *data
(dm->xdndMimeTransferedPixmapIndex + 1) % 2;
}
} else {
- DEBUG("QClipboard: xdndMimeDataForAtom(): converting to type '%s' is not supported", atomName);
+ DEBUG("QClipboard: xdndMimeDataForAtom(): converting to type '%s' is not supported", qPrintable(atomName));
}
}
return data;
@@ -624,7 +624,6 @@ QVariant QX11Data::xdndMimeConvertToFormat(Atom a, const QByteArray &data, const
if (format == QLatin1String("image/ppm")) {
if (a == XA_PIXMAP && data.size() == sizeof(Pixmap)) {
Pixmap xpm = *((Pixmap*)data.data());
- Display *dpy = display;
if (!xpm)
return QByteArray();
QPixmap qpm = QPixmap::fromX11Pixmap(xpm);