Conflicts: src/corelib/kernel/qmetatype.cpp Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a |
||
|---|---|---|
| .. | ||
| qabstractanimation | ||
| qanimationgroup | ||
| qparallelanimationgroup | ||
| qpauseanimation | ||
| qpropertyanimation | ||
| qsequentialanimationgroup | ||
| qvariantanimation | ||
| CMakeLists.txt | ||
| animation.pro | ||