Conflicts: src/corelib/global/qisenum.h src/dbus/qdbusconnection_p.h src/widgets/kernel/qwidget.cpp tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: I85102515d5fec835832cc20ffdc5c1ba578bd01d |
||
|---|---|---|
| .. | ||
| Makefile.mingw | ||
| Makefile.win32 | ||
| configure.pro | ||
| configure_pch.h | ||
| configureapp.cpp | ||
| configureapp.h | ||
| environment.cpp | ||
| environment.h | ||
| main.cpp | ||
| tools.cpp | ||
| tools.h | ||