qt5base-lts/tests/auto/printsupport
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
..
dialogs Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
kernel Merge remote-tracking branch 'origin/5.6' into dev 2015-11-18 09:01:51 +01:00
printsupport.pro QPrintSupport: Move QAbstractPrintDialog test into QPrintSupport 2013-10-26 00:39:51 +02:00