Conflicts: src/corelib/io/qfilesystemwatcher_win.cpp src/corelib/plugin/plugin.pri src/plugins/platforms/cocoa/qcocoaaccessibility.mm tests/auto/corelib/tools/qlocale/tst_qlocale.cpp Change-Id: Id6824631252609a75eff8b68792e4d10095c8fc1 |
||
|---|---|---|
| .. | ||
| qcompleter | ||
| qscroller | ||
| qsystemtrayicon | ||
| qundogroup | ||
| qundostack | ||
| util.pro | ||