diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-16 06:45:58 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-16 06:52:56 (GMT) |
| commit | 1ae4c7b989b04f89a5069d5a5db78c0d8914972b (patch) | |
| tree | e645e0dc31b2d95189a2609d849ab74bdf891325 | |
| parent | b01d52de1f942755c59e22d50b84dd37ffc8e3fe (diff) | |
| download | Qt-1ae4c7b989b04f89a5069d5a5db78c0d8914972b.zip Qt-1ae4c7b989b04f89a5069d5a5db78c0d8914972b.tar.gz Qt-1ae4c7b989b04f89a5069d5a5db78c0d8914972b.tar.bz2 | |
QX11Embed crashes on 64-bit Solaris
The data passed to XChangeProperty should be long arrays, as this is
what Xlib expects.
Task-number: 244062
Reviewed-by: Rhys Weatherley
| -rw-r--r-- | src/gui/kernel/qx11embed_x11.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp index e49c4d6..6329135 100644 --- a/src/gui/kernel/qx11embed_x11.cpp +++ b/src/gui/kernel/qx11embed_x11.cpp @@ -481,7 +481,7 @@ QX11EmbedWidget::QX11EmbedWidget(QWidget *parent) | ExposureMask | StructureNotifyMask | SubstructureNotifyMask | PropertyChangeMask); - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), internalWinId(), ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char*) data, 2); @@ -1571,7 +1571,7 @@ void QX11EmbedContainer::showEvent(QShowEvent *) { Q_D(QX11EmbedContainer); if (d->client) { - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char *) data, 2); } @@ -1587,8 +1587,7 @@ void QX11EmbedContainer::hideEvent(QHideEvent *) { Q_D(QX11EmbedContainer); if (d->client) { - unsigned int data[] = {XEMBED_VERSION, XEMBED_MAPPED}; - + long data[] = {XEMBED_VERSION, XEMBED_MAPPED}; XChangeProperty(x11Info().display(), d->client, ATOM(_XEMBED_INFO), ATOM(_XEMBED_INFO), 32, PropModeReplace, (unsigned char *) data, 2); } |