Conflicts: src/corelib/tools/qhash.h src/gui/kernel/qevent.h src/widgets/kernel/qshortcut.cpp src/widgets/kernel/qshortcut.h Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620 |
||
|---|---|---|
| .. | ||
| unixmake.cpp | ||
| unixmake.h | ||
| unixmake2.cpp | ||
Conflicts: src/corelib/tools/qhash.h src/gui/kernel/qevent.h src/widgets/kernel/qshortcut.cpp src/widgets/kernel/qshortcut.h Change-Id: If61c206ee43ad1d97f5b07f58ac93c4583ce5620 |
||
|---|---|---|
| .. | ||
| unixmake.cpp | ||
| unixmake.h | ||
| unixmake2.cpp | ||