Liang Qi 9967a011ea Merge remote-tracking branch 'origin/5.12' into 5.13 ... Conflicts: qmake/generators/makefile.cpp src/plugins/platforms/cocoa/qcocoaintegration.h src/plugins/platforms/cocoa/qcocoaintegration.mm Done-With: Jörg Bornemann <joerg.bornemann@qt.io> Change-Id: I5a61e161784cc6f947abe370aab8f2971a9cbe78		2019-06-07 13:19:27 +02:00
..
.gitignore	…
datastream.q42	…
qdatastream.pro	…
testdata.qrc	…
tst_qdatastream.cpp	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-07 13:19:27 +02:00