diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-30 13:49:21 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-30 13:49:21 (GMT) |
| commit | 00f7426f3906361fb5addb36e428648eee5e2983 (patch) | |
| tree | c299b0f6f323ea2f37161cfdf5b2fb33bbe35673 /src/plugins/mediaservices/qt7/qt7movieviewrenderer.h | |
| parent | 429b747d492ef038c2ed58a9a72060d951721252 (diff) | |
| parent | ae305abfdb795b472b2b9d200bf3b11af00d7d1f (diff) | |
| download | Qt-00f7426f3906361fb5addb36e428648eee5e2983.zip Qt-00f7426f3906361fb5addb36e428648eee5e2983.tar.gz Qt-00f7426f3906361fb5addb36e428648eee5e2983.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/3rdparty/phonon/ds9/iodevicereader.cpp
Diffstat (limited to 'src/plugins/mediaservices/qt7/qt7movieviewrenderer.h')
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7movieviewrenderer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h index 336006c..0b515ae 100644 --- a/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h +++ b/src/plugins/mediaservices/qt7/qt7movieviewrenderer.h @@ -67,7 +67,6 @@ public: QT7MovieViewRenderer(QObject *parent = 0); ~QT7MovieViewRenderer(); - void setEnabled(bool); void setMovie(void *movie); void updateNaturalSize(const QSize &newSize); @@ -87,6 +86,7 @@ private: QSize m_nativeSize; QAbstractVideoSurface *m_surface; QVideoFrame m_currentFrame; + bool m_pendingRenderEvent; QMutex m_mutex; }; |