Conflicts: tests/auto/corelib/io/qprocess/tst_qprocess.cpp Change-Id: Ib6955eb874b516b185b45d6c38cec646fbaa95f4 |
||
|---|---|---|
| .. | ||
| 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 | ||