diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:48:45 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:48:45 +0100 |
| commit | c3f5a15f24f4421e0a096b2272273d9a85f70851 (patch) | |
| tree | 59c65e23def8e47bfbdcd973737df5738e1d3285 /src/multimediawidgets/qvideowidget_p.h | |
| parent | d7cfdf52fc446f668ba8f9c96dd39c4e32e24c98 (diff) | |
| parent | f51ca0b97c90d479bac16bc549e8555bbbf5bb73 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I82a85963aa1cc6e0a2cf7a49c039c117948cbeab
Diffstat (limited to 'src/multimediawidgets/qvideowidget_p.h')
0 files changed, 0 insertions, 0 deletions