summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorCarlos Manuel Duclos Vergara <carlos.duclos@nokia.com>2010-08-19 13:03:05 (GMT)
committerCarlos Manuel Duclos Vergara <carlos.duclos@nokia.com>2010-08-19 13:08:35 (GMT)
commit76bce7b04ceaae174c8ef0db5223f2dd17d9b102 (patch)
tree5967f9ce77055d48ba463512a88c0b5f95b4eeaf /src
parent1d991c8df38e0c5e75f99ad26ebcbe35ff674751 (diff)
downloadQt-76bce7b04ceaae174c8ef0db5223f2dd17d9b102.zip
Qt-76bce7b04ceaae174c8ef0db5223f2dd17d9b102.tar.gz
Qt-76bce7b04ceaae174c8ef0db5223f2dd17d9b102.tar.bz2
Fatal crash on solaris 64 bit
We use a dummy variable for a function call, and that variable is causing a data misalignment. Changing the type to long fixes the issue. According to Denis it is ok to change this for all cases. Task-number: QTBUG-12928 Reviewed-by: Denis Dzyubenko
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qclipboard_x11.cpp3
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,