0aa2d318b1
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 |
||
---|---|---|
.. | ||
readAllStdinProcess | ||
readLineStdinProcess | ||
resources | ||
stdinProcess | ||
test | ||
.gitattributes | ||
.gitignore | ||
BLACKLIST | ||
qtextstream.pro | ||
qtextstream.qrc | ||
rfc3261.txt | ||
shift-jis.txt | ||
task113817.txt | ||
tst_qtextstream.cpp |