diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-07 13:30:29 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2014-11-07 17:19:09 +0100 |
| commit | 31d57b6d9d39d7fdc03526c9703d0b4010d512c5 (patch) | |
| tree | 9471839273c0505026c9564c57070c609dbd20b7 /examples/multimedia/video/qmlvideofx/filereader.cpp | |
| parent | 58cbea0f93af1e613eeeffec68d00c4df0ae4bf9 (diff) | |
| parent | c3f5a15f24f4421e0a096b2272273d9a85f70851 (diff) | |
| download | qtmultimedia-31d57b6d9d39d7fdc03526c9703d0b4010d512c5.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/gstreamer-1.0
Conflicts:
qtmultimedia.pro
src/gsttools/qvideosurfacegstsink.cpp
src/plugins/gstreamer/camerabin/camerabinsession.cpp
src/plugins/gstreamer/mediacapture/qgstreamercaptureservice.cpp
Change-Id: Ib533c187c010f97f96e44eb765281afd55763a8f
Diffstat (limited to 'examples/multimedia/video/qmlvideofx/filereader.cpp')
| -rw-r--r-- | examples/multimedia/video/qmlvideofx/filereader.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/examples/multimedia/video/qmlvideofx/filereader.cpp b/examples/multimedia/video/qmlvideofx/filereader.cpp index 5f5066f12..714c0914d 100644 --- a/examples/multimedia/video/qmlvideofx/filereader.cpp +++ b/examples/multimedia/video/qmlvideofx/filereader.cpp @@ -32,7 +32,6 @@ ****************************************************************************/ #include "filereader.h" -#include "trace.h" #include <QCoreApplication> #include <QDir> @@ -42,7 +41,6 @@ QString FileReader::readFile(const QString &fileName) { - qtTrace() << "FileReader::readFile" << "fileName" << fileName; QString content; QFile file(fileName); if (file.open(QIODevice::ReadOnly)) { |