Liang Qi c7934f2489 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		2015-11-18 09:01:51 +01:00
..
.gitignore	Move tst_qprinter.cpp to QtPrintSupport	2012-03-12 13:14:05 +01:00
qprinter.pro	Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API.	2015-09-01 16:57:46 +00:00
tst_qprinter.cpp	Fix tst_QPrinter::doubleSidedPrinting() test and remove from blacklist	2015-11-06 18:44:04 +00:00