diff options
| author | Robin Burchell <robin.burchell@collabora.com> | 2011-12-27 18:28:21 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-02 18:19:36 +0100 |
| commit | 9fbfddfe8afe7a73b1136f20211da7274217b9e1 (patch) | |
| tree | d453538f0cca9875070a54dcf87e9f8762e59006 /src | |
| parent | 5295aab4e60ead820305d66ab8a6b5712e5fca33 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/io/io.pri | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index a8c12227bf..521039d5d5 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 -} + |