Conflicts: src/plugins/platforms/eglfs/eglfs-plugin.pro Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| json | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| statemachine | ||
| thread | ||
| tools | ||
| xml | ||
| corelib.pro | ||
Conflicts: src/plugins/platforms/eglfs/eglfs-plugin.pro Change-Id: Id76cdbb41b7758572a3b8ea4dcb40d49bac968db |
||
|---|---|---|
| .. | ||
| animation | ||
| codecs | ||
| global | ||
| io | ||
| itemmodels | ||
| json | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| statemachine | ||
| thread | ||
| tools | ||
| xml | ||
| corelib.pro | ||