153e8b49ad
Conflicts: src/network/access/qhttp2protocolhandler_p.h src/network/kernel/kernel.pri src/network/ssl/qsslkey_qt.cpp src/plugins/platforms/cocoa/qcocoascreen.mm src/plugins/platforms/windows/accessible/iaccessible2.cpp src/plugins/platforms/windows/accessible/iaccessible2.h src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.cpp src/plugins/platforms/windows/accessible/qwindowsmsaaaccessible.h src/widgets/widgets/qmenu_p.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp tests/auto/testlib/selftests/expected_cmptest.lightxml tests/auto/testlib/selftests/expected_cmptest.teamcity tests/auto/testlib/selftests/expected_cmptest.txt tests/auto/testlib/selftests/expected_cmptest.xml Done-with: Edward Welbourne <edward.welbourne@qt.io> Change-Id: I4217cc7d840cbae3e3dd28574741544469c4c6b9 |
||
|---|---|---|
| .. | ||
| certs | ||
| echo | ||
| test | ||
| .gitattributes | ||
| .gitignore | ||
| BLACKLIST | ||
| bigfile | ||
| element.xml | ||
| empty | ||
| image1.jpg | ||
| image2.jpg | ||
| image3.jpg | ||
| index.html | ||
| qnetworkreply.pro | ||
| qnetworkreply.qrc | ||
| resource | ||
| rfc3252.txt | ||
| smb-file.txt | ||
| tst_qnetworkreply.cpp | ||
