Qt Forward Merge Bot 58a4289800 Merge remote-tracking branch 'origin/5.15' into dev ... Conflicts: tests/auto/network/socket/platformsocketengine/platformsocketengine.pri Change-Id: I22daf269a8f28f80630b5f521b91637531156404		2020-04-11 14:59:13 +02:00
..
resources	…
.gitignore	…
CMakeLists.txt	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
android_testdata.qrc	…
qtemporaryfile.pro	…
qtemporaryfile.qrc	…
tst_qtemporaryfile.cpp	QTemporaryFile/Linux: don't cut the root dir's slash	2020-04-08 19:55:00 -03:00