diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2015-10-27 02:19:36 +0100 |
|---|---|---|
| committer | Rolland Dudemaine <rolland@ghs.com> | 2016-03-22 10:59:04 +0000 |
| commit | c09bc82f0aeaecda1d0f669d7a95f2159476273f (patch) | |
| tree | b5505b84c3ee266fbe7e67e525607ac4e5847496 /src/corelib | |
| parent | 8256c680c2b0323d47b707159f4f53982999ed19 (diff) | |
Do not use forkfd for INTEGRITY.
unix is defined for the integrity target. Remove the general |integrity
and only special-case forkfd.
Change-Id: I8752e62659c28261b2309013fad6e8a82b9397d1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/io.pri | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 1ae0485840..f53dc53f85 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -131,18 +131,20 @@ win32 { io/qsettings_winrt.cpp \ io/qstorageinfo_stub.cpp } -} else:unix|integrity { +} else:unix { SOURCES += \ io/qfsfileengine_unix.cpp \ io/qfilesystemengine_unix.cpp \ io/qlockfile_unix.cpp \ io/qprocess_unix.cpp \ - io/qfilesystemiterator_unix.cpp \ - io/forkfd_qt.cpp - HEADERS += \ - ../3rdparty/forkfd/forkfd.h - INCLUDEPATH += ../3rdparty/forkfd + io/qfilesystemiterator_unix.cpp + !integrity { + SOURCES += io/forkfd_qt.cpp + HEADERS += \ + ../3rdparty/forkfd/forkfd.h + INCLUDEPATH += ../3rdparty/forkfd + } !nacl:mac: { SOURCES += io/qsettings_mac.cpp OBJECTIVE_SOURCES += io/qurl_mac.mm |