Conflicts: src/plugins/platforms/eglfs/eglfs-plugin.pro Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db |
||
|---|---|---|
| .. | ||
| data | ||
| .gitignore | ||
| qchar.pro | ||
| testdata.qrc | ||
| tst_qchar.cpp | ||
Conflicts: src/plugins/platforms/eglfs/eglfs-plugin.pro Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db |
||
|---|---|---|
| .. | ||
| data | ||
| .gitignore | ||
| qchar.pro | ||
| testdata.qrc | ||
| tst_qchar.cpp | ||