diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-05 01:20:06 (GMT) |
|---|---|---|
| committer | Andrew den Exter <andrew.den-exter@nokia.com> | 2010-02-05 01:20:06 (GMT) |
| commit | 49797723461c812ebe2f53da0583323d0314d02a (patch) | |
| tree | 4fe0b6e2af4b1f7052faa8863a5508a5886fa766 /src/multimedia | |
| parent | 1b9b3fc62da13adc667890a84c61cc873fb941c0 (diff) | |
| download | Qt-49797723461c812ebe2f53da0583323d0314d02a.zip Qt-49797723461c812ebe2f53da0583323d0314d02a.tar.gz Qt-49797723461c812ebe2f53da0583323d0314d02a.tar.bz2 | |
Remove deprecated enum and member variables from video graphics items.
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/base/qgraphicsvideoitem.h | 7 | ||||
| -rw-r--r-- | src/multimedia/qml/qmlgraphicsvideo.cpp | 1 | ||||
| -rw-r--r-- | src/multimedia/qml/qmlgraphicsvideo_p.h | 4 |
3 files changed, 0 insertions, 12 deletions
diff --git a/src/multimedia/base/qgraphicsvideoitem.h b/src/multimedia/base/qgraphicsvideoitem.h index ac215ea..f8cffdc 100644 --- a/src/multimedia/base/qgraphicsvideoitem.h +++ b/src/multimedia/base/qgraphicsvideoitem.h @@ -63,13 +63,6 @@ class Q_MULTIMEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject Q_PROPERTY(QSizeF size READ size WRITE setSize) Q_PROPERTY(QSizeF nativeSize READ nativeSize NOTIFY nativeSizeChanged) public: - enum FillMode - { - Stretch, - PreserveAspectFit, - PreserveAspectCrop - }; - QGraphicsVideoItem(QGraphicsItem *parent = 0); ~QGraphicsVideoItem(); diff --git a/src/multimedia/qml/qmlgraphicsvideo.cpp b/src/multimedia/qml/qmlgraphicsvideo.cpp index 2889793..f6a5eff 100644 --- a/src/multimedia/qml/qmlgraphicsvideo.cpp +++ b/src/multimedia/qml/qmlgraphicsvideo.cpp @@ -84,7 +84,6 @@ void QmlGraphicsVideo::_q_error(int errorCode, const QString &errorString) QmlGraphicsVideo::QmlGraphicsVideo(QmlGraphicsItem *parent) : QmlGraphicsItem(parent) , m_graphicsItem(0) - , m_fillMode(QmlGraphicsVideo::PreserveAspectFit) { m_graphicsItem = new QGraphicsVideoItem(this); diff --git a/src/multimedia/qml/qmlgraphicsvideo_p.h b/src/multimedia/qml/qmlgraphicsvideo_p.h index 4592e31..a4f8e32 100644 --- a/src/multimedia/qml/qmlgraphicsvideo_p.h +++ b/src/multimedia/qml/qmlgraphicsvideo_p.h @@ -177,10 +177,6 @@ private: QGraphicsVideoItem *m_graphicsItem; - FillMode m_fillMode; - QRectF m_scaledRect; - bool m_updatePaintDevice; - Q_PRIVATE_SLOT(mediaBase(), void _q_stateChanged(QMediaPlayer::State)) Q_PRIVATE_SLOT(mediaBase(), void _q_mediaStatusChanged(QMediaPlayer::MediaStatus)) Q_PRIVATE_SLOT(mediaBase(), void _q_metaDataChanged()) |