Conflicts: src/corelib/kernel/qmetaobject.cpp src/corelib/kernel/qvariant.cpp src/tools/moc/moc.h Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6 |
||
|---|---|---|
| .. | ||
| containers-associative | ||
| containers-sequential | ||
| qalgorithms | ||
| qbytearray | ||
| qchar | ||
| qcontiguouscache | ||
| qhash | ||
| qlist | ||
| qrect | ||
| qregexp | ||
| qstring | ||
| qstringbuilder | ||
| qstringlist | ||
| qvector | ||
| tools.pro | ||