diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2015-01-23 12:22:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-01-23 12:22:50 +0100 |
| commit | 2f494446388e314286506eae335439b7bbc75736 (patch) | |
| tree | 5b8e9ee8f8bb5ead36329017f0631489f70ea437 /src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | |
| parent | d07a22c8848fa2bf0088c961785c799cea49a833 (diff) | |
| parent | af2d5a181c3d48e04c2459d551f320cfd7186630 (diff) | |
| download | qtmultimedia-2f494446388e314286506eae335439b7bbc75736.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
Diffstat (limited to 'src/qtmultimediaquicktools/qdeclarativevideooutput.cpp')
| -rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp index d7aab6915..9a9256868 100644 --- a/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput.cpp @@ -39,11 +39,12 @@ #include <QtMultimedia/qmediaobject.h> #include <QtMultimedia/qmediaservice.h> #include <private/qmediapluginloader_p.h> - -//#define DEBUG_VIDEOITEM +#include <QtCore/qloggingcategory.h> QT_BEGIN_NAMESPACE +Q_LOGGING_CATEGORY(qLcVideo, "qt.multimedia.video") + /*! \qmltype VideoOutput \instantiates QDeclarativeVideoOutput @@ -154,9 +155,7 @@ QDeclarativeVideoOutput::~QDeclarativeVideoOutput() void QDeclarativeVideoOutput::setSource(QObject *source) { -#ifdef DEBUG_VIDEOITEM - qDebug() << Q_FUNC_INFO << source; -#endif + qCDebug(qLcVideo) << "source is" << source; if (source == m_source.data()) return; @@ -273,9 +272,7 @@ void QDeclarativeVideoOutput::_q_updateMediaObject() if (m_source) mediaObject = qobject_cast<QMediaObject*>(m_source.data()->property("mediaObject").value<QObject*>()); -#ifdef DEBUG_VIDEOITEM - qDebug() << Q_FUNC_INFO << mediaObject; -#endif + qCDebug(qLcVideo) << "media object is" << mediaObject; if (m_mediaObject.data() == mediaObject) return; |