diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-11-20 12:27:49 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-11-20 12:27:49 (GMT) |
| commit | bda75bfc7cf0137474005a0a733ff83e2aae16e9 (patch) | |
| tree | 13803dded750939f651951186c557cb051bd343f /src/gui | |
| parent | 8b45a7a160daa0d6b38ae1f6cbfd8162c580574b (diff) | |
| parent | a222302ca45e33306dacae0aa16a572c13abc483 (diff) | |
| download | Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.zip Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.tar.gz Qt-bda75bfc7cf0137474005a0a733ff83e2aae16e9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 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. |