From 09ed1ed777dc21902d53da932125aee8dd952781 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald@trolltech.com>
Date: Thu, 6 Aug 2009 11:59:09 +0200
Subject: fixed borked up merge

---
 src/corelib/kernel/qsharedmemory_unix.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp
index 61f7727..05369c4 100644
--- a/src/corelib/kernel/qsharedmemory_unix.cpp
+++ b/src/corelib/kernel/qsharedmemory_unix.cpp
@@ -48,6 +48,9 @@
 #include <qdebug.h>
 
 #include <errno.h>
+
+#ifndef QT_NO_SHAREDMEMORY
+
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
-- 
cgit v0.12