Merge integrity support into unix.
authorRobin Burchell <robin.burchell@collabora.com>
Tue, 27 Dec 2011 17:28:21 +0000 (18:28 +0100)
committerQt by Nokia <qt-info@nokia.com>
Mon, 2 Jan 2012 17:19:36 +0000 (18:19 +0100)
commit9fbfddfe8afe7a73b1136f20211da7274217b9e1
treed453538f0cca9875070a54dcf87e9f8762e59006
parent5295aab4e60ead820305d66ab8a6b5712e5fca33
Merge integrity support into unix.

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