Conflicts: configure src/plugins/platforms/winrt/qwinrtclipboard.cpp Change-Id: Ic6d58be3d1ed2bb507f2ba06c82361afd9f9ddb9 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| common.h | ||
| qtextdocument.pro | ||
| test.css | ||
| tst_qtextdocument.cpp | ||
Conflicts: configure src/plugins/platforms/winrt/qwinrtclipboard.cpp Change-Id: Ic6d58be3d1ed2bb507f2ba06c82361afd9f9ddb9 |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| common.h | ||
| qtextdocument.pro | ||
| test.css | ||
| tst_qtextdocument.cpp | ||