Conflicts: src/gui/kernel/qguiapplication.cpp src/platformsupport/input/libinput/qlibinputpointer.cpp src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h src/plugins/platforms/cocoa/qcocoawindow.h src/testlib/qtestsystem.h Change-Id: I5975ffb3261c2dd82fe02ec4e57df7c0950226c5 |
||
|---|---|---|
| .. | ||
| 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 | ||