summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-06-17 09:42:52 +0100
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-07-07 13:26:22 +0100
commit64f711e91a30c7689314f4bceca78745236f8bee (patch)
tree1235eab8f556d15443c3a970ed488765adbd57ec
parent31d4037ad8e07fc4302a846271b28965f3e11069 (diff)
downloadqt4-tools-64f711e91a30c7689314f4bceca78745236f8bee.tar.gz
MMF Phonon backend: call winId() from VideoWidget constructor
This is to be consistent with the backends for other platforms, which also call QWidget::winId() on the VideoWidget (or one of its children) during construction. Reviewed-by: Thierry Bastian
-rw-r--r--src/3rdparty/phonon/mmf/abstractvideooutput.cpp3
-rw-r--r--src/3rdparty/phonon/mmf/abstractvideoplayer.cpp3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/mmf/abstractvideooutput.cpp b/src/3rdparty/phonon/mmf/abstractvideooutput.cpp
index a8aabfda1a..2d221ed5e8 100644
--- a/src/3rdparty/phonon/mmf/abstractvideooutput.cpp
+++ b/src/3rdparty/phonon/mmf/abstractvideooutput.cpp
@@ -60,7 +60,8 @@ MMF::AbstractVideoOutput::AbstractVideoOutput(QWidget *parent)
, m_aspectRatio(DefaultAspectRatio)
, m_scaleMode(DefaultScaleMode)
{
-
+ // Ensure that this widget has a native window handle
+ winId();
}
MMF::AbstractVideoOutput::~AbstractVideoOutput()
diff --git a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp
index c45ed98a02..9ea4d18c44 100644
--- a/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractvideoplayer.cpp
@@ -384,9 +384,6 @@ void MMF::AbstractVideoPlayer::initVideoOutput()
// Suppress warnings in release builds
Q_UNUSED(connected);
- // Do these after all connections are complete, to ensure
- // that any signals generated get to their destinations.
- m_videoOutput->winId();
m_videoOutput->setVideoSize(m_videoFrameSize);
}