Conflicts: tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp Change-Id: Idd3ca5cb9a2b95a4c3513b2a4c8966e6f56193f1 |
||
|---|---|---|
| .. | ||
| bin | ||
| shared | ||
| src | ||
| .gitignore | ||
Conflicts: tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp Change-Id: Idd3ca5cb9a2b95a4c3513b2a4c8966e6f56193f1 |
||
|---|---|---|
| .. | ||
| bin | ||
| shared | ||
| src | ||
| .gitignore | ||