Alexandru Croitor c53ee1f054 Merge remote-tracking branch 'origin/wip/cmake' into dev ... Conflicts: tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt Hopefully final merge from wip/cmake, and then all cmake changes should target dev directly. Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b		2020-02-13 23:29:51 +01:00
..
certs	Merge remote-tracking branch 'origin/5.12' into 5.13	2019-06-25 15:47:42 +02:00
echo	Regenerate tests/auto/network/access	2019-11-13 10:07:12 +00:00
test	Regenerate projects one last time before merge	2020-02-12 17:30:49 +00:00
.gitattributes	…
.gitignore	…
BLACKLIST	Merge remote-tracking branch 'origin/5.15' into dev	2020-01-28 18:27:28 +01:00
CMakeLists.txt	cmake: Enable network test	2019-07-29 13:14:55 +00:00
bigfile	…
element.xml	…
empty	…
image1.jpg	…
image2.jpg	…
image3.jpg	…
index.html	…
qnetworkreply.pro	…
qnetworkreply.qrc	…
resource	…
rfc3252.txt	…
smb-file.txt	…
testserver_index.html	Rework QNetworkReply tests to use docker-based test servers	2018-07-27 17:40:27 +00:00
tst_qnetworkreply.cpp	Merge remote-tracking branch 'origin/5.15' into dev	2020-02-13 18:31:40 +01:00