Conflicts: src/corelib/io/qfilesystemengine_win.cpp src/gui/text/qdistancefield.cpp src/plugins/platforms/xcb/qxcbconnection.h Change-Id: I1be4a6f440ccb7599991159e3cb9de60990e4b1e |
||
|---|---|---|
| .. | ||
| icons | ||
| second_icons/testtheme/32x32/actions | ||
| styles/commonstyle/images | ||
| .gitignore | ||
| image.png | ||
| qicon.pro | ||
| rect.png | ||
| tst_qicon.cpp | ||
| tst_qicon.qrc | ||