Conflicts: .qmake.conf src/corelib/doc/src/objectmodel/signalsandslots.qdoc src/plugins/platforms/cocoa/qcocoamenuloader.mm src/plugins/platforms/xcb/qxcbconnection.cpp src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/platforms/xcb/qxcbwindow.cpp tests/auto/gui/image/qimage/tst_qimage.cpp Done-with: Gatis Paeglis <gatis.paeglis@qt.io> Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5 |
||
|---|---|---|
| .. | ||
| 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 | ||
| testserver_index.html | ||
| tst_qnetworkreply.cpp | ||