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	…
stdinProcess	Update copyright headers	2015-02-11 06:49:51 +00:00
test	…
.gitattributes	…
.gitignore	…
BLACKLIST	Blacklist and skip various tests that are flakey	2015-06-14 10:50:45 +00:00
qtextstream.pro	…
qtextstream.qrc	…
rfc3261.txt	…
shift-jis.txt	…
task113817.txt	…
tst_qtextstream.cpp	Rename QTextStream::readLine(QString *, qint64) into readLineInto	2015-06-03 04:27:22 +00:00