Conflicts: src/gui/util/qshaderformat.cpp src/gui/util/qshaderformat_p.h src/widgets/graphicsview/qgraphicsitem_p.h Change-Id: Idafd88eb9a0a15b4af29f6143d009c1ec8ceecca |
||
|---|---|---|
| .. | ||
| testdata/paintEvent | ||
| .gitignore | ||
| BLACKLIST | ||
| geometry-fullscreen.dat | ||
| geometry-maximized.dat | ||
| geometry.dat | ||
| qwidget.pro | ||
| qwidget.qrc | ||
| tst_qwidget.cpp | ||
| tst_qwidget_mac_helpers.h | ||
| tst_qwidget_mac_helpers.mm | ||