Conflicts: src/gui/image/qpicture.cpp Change-Id: Iecf79f96f54dc23bd703e6c4c634f909b796d7b3 |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| serialization | ||
| statemachine | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| corelib.pro | ||
Conflicts: src/gui/image/qpicture.cpp Change-Id: Iecf79f96f54dc23bd703e6c4c634f909b796d7b3 |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| serialization | ||
| statemachine | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| corelib.pro | ||