summaryrefslogtreecommitdiff
path: root/src/plugins/ivimedia/media_qtro/mediaplayerbackend.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-22 03:04:16 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-02-22 03:04:16 +0100
commit5a2c52c212ebcc8de77bc9bc97812ebfa8925c94 (patch)
treea96c5db21fda5a040cfbfb885d3d461e691b5801 /src/plugins/ivimedia/media_qtro/mediaplayerbackend.cpp
parent657ed57293b0a12364747668d6afe6ded319956f (diff)
parent9cfe33d13bb145b774f82b2b46b936f7b3a02a71 (diff)
downloadqtivi-5a2c52c212ebcc8de77bc9bc97812ebfa8925c94.tar.gz
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I7f22e7e589394456404ae9cc295c18e7700a12d5
Diffstat (limited to 'src/plugins/ivimedia/media_qtro/mediaplayerbackend.cpp')
0 files changed, 0 insertions, 0 deletions