qt5base-lts/tests/auto/corelib/io/qtextstream
Liang Qi 6cb8121a44 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/widgets/styles/qgtkstyle_p.cpp
	tests/auto/corelib/io/qtextstream/test/test.pro
	tests/auto/corelib/plugin/plugin.pro

Change-Id: I512bc1b36acf3933ed2b96c00f476ee3819c1f4b
2016-03-21 09:02:57 +01:00
..
readAllStdinProcess Updated license headers 2016-01-21 18:55:18 +00:00
readLineStdinProcess Updated license headers 2016-01-21 18:55:18 +00:00
resources Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
stdinProcess Updated license headers 2016-01-21 18:55:18 +00:00
test Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
.gitattributes Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
.gitignore Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
BLACKLIST Blacklist and skip various tests that are flakey 2015-06-14 10:50:45 +00:00
qtextstream.pro Remove Symbian-specific code from tests. 2011-09-29 06:41:42 +02:00
qtextstream.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
rfc3261.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
shift-jis.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
task113817.txt Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
tst_qtextstream.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00