Conflicts: examples/network/network-chat/peermanager.cpp src/widgets/util/qsystemtrayicon.cpp src/widgets/util/qsystemtrayicon_qpa.cpp src/widgets/util/qsystemtrayicon_win.cpp src/widgets/util/qsystemtrayicon_x11.cpp Change-Id: I1c026df83818c0ccaf956980370e7522960627db |
||
|---|---|---|
| .. | ||
| qabstractanimation | ||
| qanimationgroup | ||
| qparallelanimationgroup | ||
| qpauseanimation | ||
| qpropertyanimation | ||
| qsequentialanimationgroup | ||
| qvariantanimation | ||
| animation.pro | ||