Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0 |
||
|---|---|---|
| .. | ||
| testdata/paintEvent | ||
| .gitignore | ||
| 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 | ||