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

Conflicts:
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/network/kernel/qnetworkinterface_winrt.cpp
	tools/configure/configureapp.cpp

Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea

2 files changed, 4 insertions, 7 deletions

diff --git a/tests/auto/printsupport/kernel/qprinter/BLACKLIST b/tests/auto/printsupport/kernel/qprinter/BLACKLIST
deleted file mode 100644
index 250a18787c..0000000000
--- a/tests/auto/printsupport/kernel/qprinter/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-[doubleSidedPrinting]
-windows 32bit msvc-2013
-
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
index 318f87467c..aa72be3ea8 100644
--- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
+++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
@@ -1090,12 +1090,12 @@ void tst_QPrinter::doubleSidedPrinting()
     QPrinter native;
     if (native.outputFormat() == QPrinter::NativeFormat) {
         // Test default
-        QPrinterInfo printerInfo;
+        QPrinterInfo printerInfo(native);
         bool expected = (printerInfo.defaultDuplexMode() != QPrinter::DuplexNone);
-        QCOMPARE(native.doubleSidedPrinting(), false);
+        QCOMPARE(native.doubleSidedPrinting(), expected);
 
-        // Test set/get
-        expected = (printerInfo.supportedDuplexModes().count() > 1);
+        // Test set/get, changing the expected value if possible
+        expected = expected ? false : (printerInfo.supportedDuplexModes().count() > 1);
         native.setDoubleSidedPrinting(expected);
         QCOMPARE(native.doubleSidedPrinting(), expected);