Conflicts: src/corelib/tools/qhash.h src/gui/kernel/qevent.h src/widgets/kernel/qshortcut.cpp src/widgets/kernel/qshortcut.h Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620 |
||
|---|---|---|
| .. | ||
| resources | ||
| .gitignore | ||
| qfileinfo.pro | ||
| qfileinfo.qrc | ||
| testdata.qrc | ||
| tst_qfileinfo.cpp | ||