summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRoger Maclean <rmaclean@qnx.com>2014-01-31 14:58:54 -0500
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-03 18:43:41 +0100
commit6f8ccc88e827aeb09f6f9c7219f2d5f5013c6ebb (patch)
tree92433760256746f3430b4168330206eb6364425d /src
parentd3d898f3ed434e8df81c3fd274e30f952877a135 (diff)
Ensure the backend has had its geometry updated.
When trying to play video in an overlay window, the video fails to be displayed because everything that would cause updateGeometry to be called on the backend has already occurred prior to the backend having been created. Change-Id: Ida3c8feea69b497a18e9f44d7143bed03380d6ae Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qtmultimediaquicktools/qdeclarativevideooutput.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
index 321fd5e81..a04b38ceb 100644
--- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
+++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp
@@ -247,7 +247,10 @@ bool QDeclarativeVideoOutput::createBackend(QMediaService *service)
if (!backendAvailable) {
qWarning() << Q_FUNC_INFO << "Media service has neither renderer nor window control available.";
m_backend.reset();
+ } else if (!m_geometryDirty) {
+ m_backend->updateGeometry();
}
+
return backendAvailable;
}