diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-23 11:41:16 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-23 11:41:22 (GMT) |
| commit | d08fc6843e58c63f1c101462bb2e30166a5dbde9 (patch) | |
| tree | 29e68fe1fc72a0931f13d67587b9cfda98e48858 /src/gui | |
| parent | b4dbbd30c8092a81984cca30248db087353fe66e (diff) | |
| parent | 4112771f56e827d1d8fbde0995ebf5b0242c01a8 (diff) | |
| download | Qt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.zip Qt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.tar.gz Qt-d08fc6843e58c63f1c101462bb2e30166a5dbde9.tar.bz2 | |
Merge 'upstream/4.6' into oslo-staging-2/4.6
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qnativeimage.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp index e4ea2e9..3b43ab6 100644 --- a/src/gui/image/qnativeimage.cpp +++ b/src/gui/image/qnativeimage.cpp @@ -178,6 +178,8 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /* if (ok) { xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0); xshminfo.shmaddr = xshmimg->data; + if (shmctl(xshminfo.shmid, IPC_RMID, 0) == -1) + qWarning() << "Error while marking the shared memory segment to be destroyed"; ok = (xshminfo.shmaddr != (char*)-1); if (ok) image = QImage((uchar *)xshmimg->data, width, height, systemFormat()); diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index a16d1f8..72eedad 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -1451,7 +1451,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) [image release]; dragPrivate()->executed_action = Qt::IgnoreAction; object = 0; - Qt::DropAction performedAction(qt_mac_mapNSDragOperation(dndParams.performedAction)); + Qt::DropAction performedAction(qt_mac_mapNSDragOperation(qMacDnDParams()->performedAction)); // do post drag processing, if required. if(performedAction != Qt::IgnoreAction) { // check if the receiver points us to a file location. |