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

Conflicts:
	config.tests/unix/compile.test
	src/plugins/platforms/cocoa/qcocoahelpers.mm
	src/tools/qlalr/cppgenerator.cpp

Change-Id: I0103ca076a9aca7118b2fd99f0fdaf81055998c3

1 files changed, 3 insertions, 3 deletions

diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index 218fb5b078..1ae0485840 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -107,8 +107,6 @@ win32 {
 
     !winrt {
         SOURCES += io/qsettings_win.cpp
-        HEADERS += io/qwindowspipewriter_p.h
-        SOURCES += io/qwindowspipewriter.cpp
         SOURCES += io/qstandardpaths_win.cpp
 
         wince* {
@@ -117,11 +115,13 @@ win32 {
         } else {
             HEADERS += \
                 io/qwinoverlappedionotifier_p.h \
-                io/qwindowspipereader_p.h
+                io/qwindowspipereader_p.h \
+                io/qwindowspipewriter_p.h
             SOURCES += \
                 io/qprocess_win.cpp \
                 io/qwinoverlappedionotifier.cpp \
                 io/qwindowspipereader.cpp \
+                io/qwindowspipewriter.cpp \
                 io/qstorageinfo_win.cpp
             LIBS += -lmpr
         }