qt5base-lts/tests/auto/corelib/io/qtextstream
Liang Qi 0aa2d318b1 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c
2015-07-01 11:05:26 +02:00
..
readAllStdinProcess Update copyright headers 2015-02-11 06:49:51 +00:00
readLineStdinProcess Update copyright headers 2015-02-11 06:49:51 +00:00
resources Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
stdinProcess Update copyright headers 2015-02-11 06:49:51 +00:00
test Set the Qt API level to compatibility mode in all tests. 2012-08-01 15:37:46 +02: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 Rename QTextStream::readLine(QString *, qint64) into readLineInto 2015-06-03 04:27:22 +00:00