Conflicts: src/corelib/tools/qbytearray.cpp src/gui/image/qimage.cpp src/gui/image/qppmhandler.cpp src/gui/kernel/qguiapplication.cpp src/gui/painting/qpaintengine_raster.cpp Change-Id: I7c1a8e7ebdfd7f7ae767fdb932823498a7660765 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| common.h | ||
| qtextdocument.pro | ||
| tst_qtextdocument.cpp | ||