diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-04-16 06:45:58 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-04-17 02:22:35 (GMT) |
| commit | d3005bd5eca03834a5563469ad844a1041e29317 (patch) | |
| tree | 109b9bfc7d5d72f4ac00226d3ef4e7834ec91191 | |
| parent | 41a2b73a4bf5e7e8e1c0af458a120e2cf75f8035 (diff) | |
| download | Qt-d3005bd5eca03834a5563469ad844a1041e29317.zip Qt-d3005bd5eca03834a5563469ad844a1041e29317.tar.gz Qt-d3005bd5eca03834a5563469ad844a1041e29317.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
(cherry picked from commit 1ae4c7b989b04f89a5069d5a5db78c0d8914972b)
| -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 22cae87..f991275 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); } |