diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 16:15:38 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-19 16:15:38 (GMT) |
| commit | a1014603b66ef5c15cab043333ed63eaaf3c646e (patch) | |
| tree | 34c8a8d2b0ce08c3c561d068206943215647e6eb /src | |
| parent | e82b5535c170c82d3ba7369eb1957f8d264300e2 (diff) | |
| parent | 76bce7b04ceaae174c8ef0db5223f2dd17d9b102 (diff) | |
| download | Qt-a1014603b66ef5c15cab043333ed63eaaf3c646e.zip Qt-a1014603b66ef5c15cab043333ed63eaaf3c646e.tar.gz Qt-a1014603b66ef5c15cab043333ed63eaaf3c646e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fatal crash on solaris 64 bit
qdoc: Added more elements to qt.pageindex
doc: Removed comment about automatic inclusion of 3rd party library.
qdoc3: Added more pagewords & elements to the search index.
qdoc3: Added more pagewords & elements to the search index.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qclipboard_x11.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qclipboard_x11.cpp b/src/gui/kernel/qclipboard_x11.cpp index 9fcc718..4b75f0a 100644 --- a/src/gui/kernel/qclipboard_x11.cpp +++ b/src/gui/kernel/qclipboard_x11.cpp @@ -456,7 +456,8 @@ QClipboard::QClipboard(QObject *parent) XCheckIfEvent(X11->display, &ev, &qt_init_timestamp_scanner, (XPointer)&data); if (data.timestamp == CurrentTime) { setupOwner(); - int dummy = 0; + // We need this value just for completeness, we don't use it. + long dummy = 0; Window ownerId = owner->internalWinId(); XChangeProperty(X11->display, ownerId, ATOM(CLIP_TEMPORARY), XA_INTEGER, 32, |