Conflicts: src/gui/painting/qdrawhelper.cpp Change-Id: I4916e07b635e1d3830e9b46ef7914f99bec3098e |
||
|---|---|---|
| .. | ||
| almostplugin | ||
| elftest | ||
| lib | ||
| machtest | ||
| staticplugin | ||
| theplugin | ||
| tst | ||
| .gitignore | ||
| empty.json | ||
| fakeplugin.cpp | ||
| qpluginloader.pro | ||
| tst_qpluginloader.cpp | ||
| utf8_data.json | ||
| winrt.pri | ||