From 9fbfddfe8afe7a73b1136f20211da7274217b9e1 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@collabora.com>
Date: Tue, 27 Dec 2011 18:28:21 +0100
Subject: [PATCH] Merge integrity support into unix.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Similarly to ec9ea7f3e819cb0c2da8c8977f9cc44688c9b6f6, the code in unix
(non-Linux/OS X) is actually the same as for integrity, so merge the
conditionals together to save duplication.

This should have the side-effect of unbreaking Qt 5 on integrity wrt
the new QStandardPaths introduction, which was not added to the integrity
block.

Change-Id: Ib512fa781f5ceb240069888ce6958c9af2990d37
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
---
 src/corelib/io/io.pri | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index a8c1222..521039d 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -82,7 +82,7 @@ win32 {
         SOURCES += io/qfilesystemengine_win.cpp
         SOURCES += io/qfilesystemiterator_win.cpp
         SOURCES += io/qstandardpaths_win.cpp
-} else:unix {
+} else:unix|integrity {
         SOURCES += \
                 io/qfsfileengine_unix.cpp \
                 io/qfilesystemengine_unix.cpp \
@@ -117,9 +117,4 @@ win32 {
             }
         }
 }
-integrity {
-	SOURCES += io/qfsfileengine_unix.cpp \
-            io/qfsfileengine_iterator.cpp \
-            io/qfilesystemengine_unix.cpp \
-            io/qfilesystemiterator_unix.cpp
-}
+
-- 
2.7.4