Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	examples/corelib/ipc/ipc.pro
	src/plugins/platforms/xcb/qxcbbackingstore.cpp
	tests/auto/corelib/tools/qcommandlineparser/tst_qcommandlineparser.cpp

Change-Id: Ia006e10ff1732fe78f90138c41f05b59b49486cf

1 files changed, 9 insertions, 7 deletions

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index 9d7210fb4f..052dc8408b 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -127,18 +127,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
@@ -154,7 +156,7 @@ win32 {
             } else:ios {
                 LIBS += -framework MobileCoreServices
             }
-        } else:android:!android-no-sdk {
+        } else:android {
             SOURCES += \
                 io/qstandardpaths_android.cpp \
                 io/qstorageinfo_unix.cpp