diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-08 13:52:51 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-08 13:52:51 (GMT) |
| commit | 61975fcccac7dc20f0fcda4294a4660560501afc (patch) | |
| tree | da47fa4bc83b3450503265e03185f9dee05678ff /src/gui/kernel/qdnd_x11.cpp | |
| parent | 3973481089f9101668c20a9317b759e09a784070 (diff) | |
| parent | b546a7c8c57fdfe18b3293c8fef8c4a58ad77f59 (diff) | |
| download | Qt-61975fcccac7dc20f0fcda4294a4660560501afc.zip Qt-61975fcccac7dc20f0fcda4294a4660560501afc.tar.gz Qt-61975fcccac7dc20f0fcda4294a4660560501afc.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/gui/kernel/qdnd_x11.cpp')
| -rw-r--r-- | src/gui/kernel/qdnd_x11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp index 92dd0a1..68d7688 100644 --- a/src/gui/kernel/qdnd_x11.cpp +++ b/src/gui/kernel/qdnd_x11.cpp @@ -1887,7 +1887,7 @@ static QVariant xdndObtainData(const char *format, QVariant::Type requestedType) if (got) { Atom type; - if (X11->clipboardReadProperty(tw->effectiveWinId(), ATOM(XdndSelection), true, &result, 0, &type, 0, false)) { + if (X11->clipboardReadProperty(tw->effectiveWinId(), ATOM(XdndSelection), true, &result, 0, &type, 0)) { if (type == ATOM(INCR)) { int nbytes = result.size() >= 4 ? *((int*)result.data()) : 0; result = X11->clipboardReadIncrementalProperty(tw->effectiveWinId(), ATOM(XdndSelection), nbytes, false); |