1d53b6d9f2
Conflicts: tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp Change-Id: Idd3ca5cb9a2b95a4c3513b2a4c8966e6f56193f1 |
||
---|---|---|
.. | ||
.gitignore | ||
qshortcut.pro | ||
tst_qshortcut.cpp |
1d53b6d9f2
Conflicts: tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp Change-Id: Idd3ca5cb9a2b95a4c3513b2a4c8966e6f56193f1 |
||
---|---|---|
.. | ||
.gitignore | ||
qshortcut.pro | ||
tst_qshortcut.cpp |