diff options
| author | ninerider <qt-info@nokia.com> | 2009-10-01 11:56:20 (GMT) |
|---|---|---|
| committer | ninerider <qt-info@nokia.com> | 2009-10-01 11:56:20 (GMT) |
| commit | a5957fde4d34c9571c3eadd620df9d490189ddd5 (patch) | |
| tree | d9c39efda782bb7c899663297ab79b2e6705755b /src/gui/kernel | |
| parent | cf7bbfca65039f0e94951269e2dfc09ae66a28d4 (diff) | |
| parent | 25a0a22533f593ed1a91567be3f74ed8b48e7717 (diff) | |
| download | Qt-a5957fde4d34c9571c3eadd620df9d490189ddd5.zip Qt-a5957fde4d34c9571c3eadd620df9d490189ddd5.tar.gz Qt-a5957fde4d34c9571c3eadd620df9d490189ddd5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qdnd_x11.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index 33da0f3..da150fb 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -506,6 +506,7 @@ bool QX11Data::xdndMimeDataForAtom(Atom a, QMimeData *mimeData, QByteArray *data *atomFormat = textprop.encoding; *dataFormat = textprop.format; *data = QByteArray((const char *) textprop.value, textprop.nitems * textprop.format / 8); + ret = true; DEBUG(" textprop type %lx\n" " textprop name '%s'\n" @@ -541,12 +542,13 @@ bool QX11Data::xdndMimeDataForAtom(Atom a, QMimeData *mimeData, QByteArray *data dm->xdndMimeTransferedPixmap[dm->xdndMimeTransferedPixmapIndex] = pm; dm->xdndMimeTransferedPixmapIndex = (dm->xdndMimeTransferedPixmapIndex + 1) % 2; + ret = true; } } else { DEBUG("QClipboard: xdndMimeDataForAtom(): converting to type '%s' is not supported", qPrintable(atomName)); } } - return data; + return ret && data != 0; } //$$$ |