qt5base-lts/tests/auto/corelib/io/qiodevice
Liang Qi 8f569c740a Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
	config.tests/common/atomic64/atomic64.cpp
	configure
	src/3rdparty/forkfd/forkfd.c
	src/corelib/io/forkfd_qt.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
	tools/configure/configureapp.cpp

Change-Id: Ic6168d82e51a0ef1862c3a63bee6722e8f138414
2016-01-19 10:03:01 +01:00
..
.gitignore Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
android_testdata.qrc Android: Fix QIODevice tests 2014-12-22 09:27:44 +01:00
BLACKLIST Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
qiodevice.pro Android: Fix QIODevice tests 2014-12-22 09:27:44 +01:00
tst_qiodevice.cpp Merge remote-tracking branch 'origin/5.5' into 5.6 2016-01-19 10:03:01 +01:00