diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 22:50:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-23 22:50:33 (GMT) |
| commit | ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb (patch) | |
| tree | 691250169f111cad7b0d3061796f37bb364c8b70 /src/plugins/mediaservices/qt7/qt7movievideowidget.mm | |
| parent | af4f30abb88d242d1e310914b53bc91b24e45a59 (diff) | |
| parent | 91ed4f664008577a095f5554372456661865dede (diff) | |
| download | Qt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.zip Qt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.tar.gz Qt-ccfecf7f8259c1e584a65fefb0ca2f2dfb850eeb.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Remove active qDebugs.
Player demo updated with more user-friendly previous button behaviour.
Added QNetworkRequest constructor to QMediaContent.
Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.
Add private header warning.
Diffstat (limited to 'src/plugins/mediaservices/qt7/qt7movievideowidget.mm')
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7movievideowidget.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm index 6e74fcd..4043330 100644 --- a/src/plugins/mediaservices/qt7/qt7movievideowidget.mm +++ b/src/plugins/mediaservices/qt7/qt7movievideowidget.mm @@ -184,7 +184,7 @@ QT7MovieVideoWidget::QT7MovieVideoWidget(QObject *parent) m_hue(0), m_saturation(0) { - qDebug() << "QT7MovieVideoWidget"; +// qDebug() << "QT7MovieVideoWidget"; QGLFormat format = QGLFormat::defaultFormat(); format.setSwapInterval(1); // Vertical sync (avoid tearing) @@ -249,7 +249,7 @@ void QT7MovieVideoWidget::setupVideoOutput() { AutoReleasePool pool; - qDebug() << "QT7MovieVideoWidget::setupVideoOutput" << m_movie; +// qDebug() << "QT7MovieVideoWidget::setupVideoOutput" << m_movie; if (m_movie == 0) { m_displayLink->stop(); |