aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/qt4-gui/files/patch-src__gui__image__qnativeimage.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/qt4-gui/files/patch-src__gui__image__qnativeimage.cpp')
-rw-r--r--x11-toolkits/qt4-gui/files/patch-src__gui__image__qnativeimage.cpp23
1 files changed, 0 insertions, 23 deletions
diff --git a/x11-toolkits/qt4-gui/files/patch-src__gui__image__qnativeimage.cpp b/x11-toolkits/qt4-gui/files/patch-src__gui__image__qnativeimage.cpp
deleted file mode 100644
index e869f1b40544..000000000000
--- a/x11-toolkits/qt4-gui/files/patch-src__gui__image__qnativeimage.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./src/gui/image/qnativeimage.cpp.orig 2012-03-12 13:30:21.000000000 +0100
-+++ ./src/gui/image/qnativeimage.cpp 2012-03-12 13:32:39.000000000 +0100
-@@ -178,15 +178,17 @@
- 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, format);
- }
- xshminfo.readOnly = false;
-- if (ok)
-+ if (ok) {
- ok = XShmAttach(X11->display, &xshminfo);
-+ XSync(X11->display, False);
-+ if (shmctl(xshminfo.shmid, IPC_RMID, 0) == -1)
-+ qWarning() << "Error while marking the shared memory segment to be destroyed";
-+ }
- if (!ok) {
- qWarning() << "QNativeImage: Unable to attach to shared memory segment.";
- if (xshmimg->data) {