Conflicts: src/corelib/kernel/qmetatype.cpp src/gui/kernel/qplatformsurface_qpa.cpp tests/auto/corelib/tools/qtimeline/qtimeline.pro Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178 |
||
|---|---|---|
| .. | ||
| corelib | ||
| dbus | ||
| examples | ||
| gui | ||
| images | ||
| network | ||
| printsupport | ||
| snippets | ||
| sql | ||
| widgets | ||
| xml | ||