Conflicts: src/corelib/kernel/qeventdispatcher_win.cpp Change-Id: I32db3f755577aefc15f757041367d6144f5e5c66 |
||
|---|---|---|
| .. | ||
| qcompleter | ||
| qscroller | ||
| qsystemtrayicon | ||
| qundogroup | ||
| qundostack | ||
| util.pro | ||
Conflicts: src/corelib/kernel/qeventdispatcher_win.cpp Change-Id: I32db3f755577aefc15f757041367d6144f5e5c66 |
||
|---|---|---|
| .. | ||
| qcompleter | ||
| qscroller | ||
| qsystemtrayicon | ||
| qundogroup | ||
| qundostack | ||
| util.pro | ||