Conflicts: .qmake.conf Change-Id: I936be3c0df2b9845ff6a85eb3d4442cdabe63d37 |
||
|---|---|---|
| .. | ||
| 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 | ||