qt5base-lts/tests/auto/gui/image/qimage
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
..
images Add test for invalid exif data 2015-07-17 11:37:02 +00:00
.gitignore Moved gui autotests into new directory structure 2011-09-01 10:59:49 +02:00
qimage.pro Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qimage.qrc Android: Fix qimage test. 2015-01-08 10:09:39 +01:00
tst_qimage.cpp Merge remote-tracking branch 'origin/5.6' into dev 2015-11-18 09:01:51 +01:00