Conflicts: src/plugins/platforms/xcb/qxcbdrag.cpp Change-Id: I0b47324b70b0b4894e54b21aa3e7a5041f9bd5e3 |
||
|---|---|---|
| .. | ||
| codecs | ||
| io | ||
| json | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| corelib.pro | ||
Conflicts: src/plugins/platforms/xcb/qxcbdrag.cpp Change-Id: I0b47324b70b0b4894e54b21aa3e7a5041f9bd5e3 |
||
|---|---|---|
| .. | ||
| codecs | ||
| io | ||
| json | ||
| kernel | ||
| mimetypes | ||
| plugin | ||
| text | ||
| thread | ||
| time | ||
| tools | ||
| corelib.pro | ||