diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-09 15:33:38 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-09 15:33:38 (GMT) |
| commit | b4ddf0420db30098274986612ca3e8951ef18e2e (patch) | |
| tree | a85bdad9b92652b09dd613b2172d5b07d4926d4b /src/gui/kernel/qdnd_x11.cpp | |
| parent | 612a7680e10eb434cd6e09a2165ab1b75efdb72a (diff) | |
| parent | e1fead7c4f877308c2cc11131c445a1f7085baf7 (diff) | |
| download | Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.zip Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.tar.gz Qt-b4ddf0420db30098274986612ca3e8951ef18e2e.tar.bz2 | |
Merge branch '4.7' into mimir
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); |