Commented out qDebug() for multimedia src and backends

18 files changed, 93 insertions, 96 deletions

diff --git a/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp b/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp
index 537c414572..2d0975b2dd 100644
--- a/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp
+++ b/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp
@@ -58,7 +58,7 @@ QMediaService* AudioCaptureServicePlugin::create(QString const& key)
     if (key == QLatin1String(Q_MEDIASERVICE_AUDIOSOURCE))
         return new AudioCaptureService;
 
-    qDebug() << "unsupported key:" << key;
+    //qDebug() << "unsupported key:" << key;
     return 0;
 }
 
diff --git a/plugins/multimedia/directshow/dsserviceplugin.cpp b/plugins/multimedia/directshow/dsserviceplugin.cpp
index a55a5a2cbd..6dc963807d 100644
--- a/plugins/multimedia/directshow/dsserviceplugin.cpp
+++ b/plugins/multimedia/directshow/dsserviceplugin.cpp
@@ -91,7 +91,7 @@ QMediaService* DSServicePlugin::create(QString const& key)
         return new DirectShowPlayerService;
 #endif
 
-    qDebug() << "unsupported key:" << key;
+    //qDebug() << "unsupported key:" << key;
     return 0;
 }
 
diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp
index 9fcaa431b3..5a6cac7028 100644
--- a/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp
+++ b/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp
@@ -166,7 +166,7 @@ GstElement *QGstreamerAudioEncode::createEncoder()
 
         gst_caps_append_structure(caps,structure);
 
-        qDebug() << "set caps filter:" << gst_caps_to_string(caps);
+        //qDebug() << "set caps filter:" << gst_caps_to_string(caps);
 
         g_object_set(G_OBJECT(capsFilter), "caps", caps, NULL);
     }
diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.cpp
index 7a4be74226..c268b3e79e 100644
--- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.cpp
+++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercameracontrol.cpp
@@ -195,7 +195,7 @@ void QGstreamerCameraControl::updateSupportedResolutions(const QString &device)
             char formatStr[5];
             memcpy(formatStr, &format, 4);
             formatStr[4] = 0;
-            qDebug() << "trying format" << formatStr;
+            //qDebug() << "trying format" << formatStr;
         }
 
         for (int i=0;;i++) {
diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp
index 3c9089136e..15e186c1ca 100644
--- a/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp
+++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp
@@ -293,7 +293,7 @@ GstElement *QGstreamerCaptureSession::buildVideoPreview()
                 gst_caps_append_structure(caps,structure);
             }
 
-            qDebug() << "set video preview caps filter:" << gst_caps_to_string(caps);
+            //qDebug() << "set video preview caps filter:" << gst_caps_to_string(caps);
 
             g_object_set(G_OBJECT(capsFilter), "caps", caps, NULL);
 
diff --git a/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp b/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp
index 7aa672e688..64a9d21ef0 100644
--- a/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp
+++ b/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp
@@ -150,7 +150,7 @@ GstElement *QGstreamerVideoEncode::createEncoder()
     gst_bin_add(encoderBin, colorspace);
 
     QString codec = m_videoSettings.codec();
-    qDebug() << "create encoder for video codec" << codec;
+    //qDebug() << "create encoder for video codec" << codec;
 
     GstElement *encoderElement = gst_element_factory_make( m_elementNames.value(codec).constData(), "video-encoder");
     gst_bin_add(encoderBin, encoderElement);
diff --git a/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp b/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp
index 43b7bc1d03..f15c6d4224 100644
--- a/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp
+++ b/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp
@@ -96,7 +96,7 @@ QMediaService* QGstreamerServicePlugin::create(const QString &key)
         return new QGstreamerCaptureService(key);
 #endif
 
-    qDebug() << "unsupported key:" << key;
+    //qDebug() << "unsupported key:" << key;
     return 0;
 }
 
@@ -142,7 +142,7 @@ void QGstreamerServicePlugin::updateDevices() const
     QFileInfoList entries = devDir.entryInfoList(QStringList() << "video*");
 
     foreach( const QFileInfo &entryInfo, entries ) {
-        qDebug() << "Try" << entryInfo.filePath();
+        //qDebug() << "Try" << entryInfo.filePath();
 
         int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
         if (fd == -1)
@@ -169,7 +169,7 @@ void QGstreamerServicePlugin::updateDevices() const
                 name = entryInfo.fileName();
             else
                 name = QString((const char*)vcap.card);
-            qDebug() << "found camera: " << name;
+            //qDebug() << "found camera: " << name;
 
             m_cameraDevices.append(entryInfo.filePath().toLocal8Bit());
             m_cameraDescriptions.append(name);
diff --git a/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp b/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp
index 50594096e5..8e7b9fe3e5 100644
--- a/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp
+++ b/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp
@@ -120,7 +120,7 @@ void QGstreamerVideoInputDeviceControl::update()
     QFileInfoList entries = devDir.entryInfoList(QStringList() << "video*");
 
     foreach( const QFileInfo &entryInfo, entries ) {
-        qDebug() << "Try" << entryInfo.filePath();
+        //qDebug() << "Try" << entryInfo.filePath();
 
         int fd = ::open(entryInfo.filePath().toLatin1().constData(), O_RDWR );
         if (fd == -1)
@@ -147,7 +147,7 @@ void QGstreamerVideoInputDeviceControl::update()
                 name = entryInfo.fileName();
             else
                 name = QString((const char*)vcap.card);
-            qDebug() << "found camera: " << name;
+            //qDebug() << "found camera: " << name;
 
             m_names.append(entryInfo.filePath());
             m_descriptions.append(name);
diff --git a/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp b/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp
index 39e1592826..d58625a9ad 100644
--- a/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp
+++ b/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp
@@ -182,7 +182,7 @@ void QGstXvImageBufferPool::queuedAlloc()
             );
 
     if (!xvBuffer->xvImage) {
-        qDebug() << "QGstXvImageBufferPool: XvShmCreateImage failed";
+        //qDebug() << "QGstXvImageBufferPool: XvShmCreateImage failed";
         m_allocWaitCondition.wakeOne();
         return;
     }
@@ -192,7 +192,7 @@ void QGstXvImageBufferPool::queuedAlloc()
     xvBuffer->shmInfo.readOnly = False;
 
     if (!XShmAttach(QX11Info::display(), &xvBuffer->shmInfo)) {
-        qDebug() << "QGstXvImageBufferPool: XShmAttach failed";
+        //qDebug() << "QGstXvImageBufferPool: XShmAttach failed";
         m_allocWaitCondition.wakeOne();
         return;
     }
diff --git a/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp b/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp
index c5eeaeeb06..f9d6ae2783 100644
--- a/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp
+++ b/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp
@@ -618,7 +618,7 @@ GstFlowReturn QVideoSurfaceGstSink::buffer_alloc(
         QVideoSurfaceFormat format = formatForCaps(intersection, &bytesPerLine);
 
         if (!sink->delegate->start(format, bytesPerLine)) {
-            qDebug() << "failed to start video surface";
+            //qDebug() << "failed to start video surface";
             return GST_FLOW_NOT_NEGOTIATED;
         }
     }
diff --git a/plugins/multimedia/phonon/qphononserviceplugin.cpp b/plugins/multimedia/phonon/qphononserviceplugin.cpp
index 38f36963bd..bf56624638 100644
--- a/plugins/multimedia/phonon/qphononserviceplugin.cpp
+++ b/plugins/multimedia/phonon/qphononserviceplugin.cpp
@@ -58,7 +58,7 @@ QMediaService* QPhononServicePlugin::create(QString const& key)
     if (key == QLatin1String(Q_MEDIASERVICE_MEDIAPLAYER))
         return new QPhononPlayerService;
 
-    qDebug() << "unsupported key:" << key;
+    //qDebug() << "unsupported key:" << key;
     return 0;
 }
 
diff --git a/plugins/multimedia/symbian/camera/s60cameracontrol.cpp b/plugins/multimedia/symbian/camera/s60cameracontrol.cpp
index eb9db17faa..d632c83c1d 100644
--- a/plugins/multimedia/symbian/camera/s60cameracontrol.cpp
+++ b/plugins/multimedia/symbian/camera/s60cameracontrol.cpp
@@ -71,9 +71,6 @@ void S60CameraControl::start()
     if (m_session) {
         m_session->startCamera();
     }
-    else 
-        qDebug() << "S60CameraControl::start() - NO SESSION!";
-        
 }
 void S60CameraControl::stop()
 {
diff --git a/plugins/multimedia/symbian/camera/s60cameraexposurecontrol.cpp b/plugins/multimedia/symbian/camera/s60cameraexposurecontrol.cpp
index 238fc23ae2..43069bbda3 100644
--- a/plugins/multimedia/symbian/camera/s60cameraexposurecontrol.cpp
+++ b/plugins/multimedia/symbian/camera/s60cameraexposurecontrol.cpp
@@ -109,11 +109,11 @@ QCamera::ExposureMode S60CameraExposureControl::exposureMode() const
 
 void S60CameraExposureControl::setExposureMode(QCamera::ExposureMode mode)
 {
-    qDebug() << "S60CameraExposureControl::setExposureMode";
+    //qDebug() << "S60CameraExposureControl::setExposureMode";
     QCamera::ExposureModes supportedModes = supportedExposureModes();
     if (supportedModes & mode) {
         m_exposureMode = mode;
-        qDebug() << "Set exposure mode";
+        //qDebug() << "Set exposure mode";
         m_session->setExposureMode(m_exposureMode);
     } 
 }
diff --git a/plugins/multimedia/symbian/camera/s60camerasession.cpp b/plugins/multimedia/symbian/camera/s60camerasession.cpp
index 8cbc5db7ff..544412b8ea 100644
--- a/plugins/multimedia/symbian/camera/s60camerasession.cpp
+++ b/plugins/multimedia/symbian/camera/s60camerasession.cpp
@@ -109,7 +109,7 @@ S60CameraSettings* S60CameraSession::advancedSettings()
 
 void S60CameraSession::resetCamera()
 {
-    qDebug() << "S60CameraSession::resetCamera START";
+    //qDebug() << "S60CameraSession::resetCamera START";
     delete m_videoUtility;
     m_videoUtility = NULL;
     delete m_advancedSettings;
@@ -118,7 +118,7 @@ void S60CameraSession::resetCamera()
     m_cameraEngine = NULL;  
     m_error = KErrNone;
     m_state = QCamera::StoppedState;
-    qDebug() << "S60CameraSession::resetCamera. Creating new camera with index=" << m_deviceIndex;
+    //qDebug() << "S60CameraSession::resetCamera. Creating new camera with index=" << m_deviceIndex;
     TRAPD(err, 
         m_cameraEngine = CCameraEngine::NewL(m_deviceIndex, 0, this);
         m_advancedSettings = new S60CameraSettings(this, m_cameraEngine);
@@ -130,7 +130,7 @@ void S60CameraSession::resetCamera()
     
     initializeVideoCaptureSettings();
     
-    qDebug() << "S60CameraSession::resetCamera END";
+    //qDebug() << "S60CameraSession::resetCamera END";
 }
 
 void S60CameraSession::setError(TInt aError)
@@ -178,7 +178,7 @@ QCamera::Error S60CameraSession::fromSymbianErrorToMultimediaError(int aError)
 
 void S60CameraSession::startCamera()
 {
-    qDebug() << "S60CameraSession::startCamera START";
+    //qDebug() << "S60CameraSession::startCamera START";
     #ifdef Q_CC_NOKIAX86
     MceoCameraReady(); // signal that we are ready
     #endif
@@ -187,15 +187,15 @@ void S60CameraSession::startCamera()
     resetCamera();
 
     if (!m_error ) {
-        qDebug() << "S60CameraSession::startCamera, ReserveAndPowerOn"<< m_error;
+        //qDebug() << "S60CameraSession::startCamera, ReserveAndPowerOn"<< m_error;
         m_cameraEngine->ReserveAndPowerOn();
     }
-    qDebug() << "S60CameraSession::startCamera END";
+    //qDebug() << "S60CameraSession::startCamera END";
 }
 
 void S60CameraSession::stopCamera()
 {
-    qDebug() <<  "Stopping camera";
+    //qDebug() <<  "Stopping camera";
     m_state = QCamera::StoppedState;
 
     if (m_cameraEngine) {
@@ -206,7 +206,7 @@ void S60CameraSession::stopCamera()
 
 void S60CameraSession::capture(const QString &fileName)
 {
-    qDebug() << "S60CameraSession::capture to file="<< fileName;
+    //qDebug() << "S60CameraSession::capture to file="<< fileName;
     m_error = KErrNone;
     m_stillCaptureFileName = fileName;
     emit readyForCaptureChanged(false);
@@ -238,7 +238,7 @@ void S60CameraSession::capture(const QString &fileName)
 bool S60CameraSession::deviceReady()
 {
     #ifdef Q_CC_NOKIAX86
-    qDebug() << "device ready";
+    //qDebug() << "device ready";
     return true;
     #endif
     if ( m_cameraEngine )
@@ -274,25 +274,25 @@ QList<QVideoFrame::PixelFormat> S60CameraSession::supportedPixelFormats()
     list << QVideoFrame::Format_RGB565;
     #endif
     //TODO: fix supportedformats
-    qDebug() << "S60CameraSession::pixeformat, returning="<<list;
+    //qDebug() << "S60CameraSession::pixeformat, returning="<<list;
     return list;
 }
 
 QVideoFrame::PixelFormat S60CameraSession::pixelFormat() const
 {
-    qDebug() << "S60CameraSession::pixeformat, returning="<<m_pixelF;
+    //qDebug() << "S60CameraSession::pixeformat, returning="<<m_pixelF;
     return m_pixelF;
 }
 
 void S60CameraSession::setPixelFormat(QVideoFrame::PixelFormat fmt)
 {
-    qDebug() << "S60CameraSession::setPixelFormat, format="<<fmt;
+    //qDebug() << "S60CameraSession::setPixelFormat, format="<<fmt;
     m_pixelF = fmt;
 }
 
 QList<QSize> S60CameraSession::supportedVideoResolutions()
 {
-    qDebug() << "S60CameraSession::supportedVideoResolutions";
+    //qDebug() << "S60CameraSession::supportedVideoResolutions";
     QList<QSize> list;
     // if we have cameraengine loaded and we can update camerainfo
     if (m_cameraEngine && queryCurrentCameraInfo()) {
@@ -326,7 +326,7 @@ QList<QSize> S60CameraSession::supportedVideoResolutions()
 
 QList<qreal> S60CameraSession::supportedVideoFrameRates()
 {
-    qDebug() << "S60CameraSession::supportedVideoResolutions";
+    //qDebug() << "S60CameraSession::supportedVideoResolutions";
     QList<qreal> list;
     // if we have cameraengine loaded and we can update camerainfo
     if (m_cameraEngine && queryCurrentCameraInfo()) {
@@ -361,20 +361,20 @@ QList<qreal> S60CameraSession::supportedVideoFrameRates()
 
 bool S60CameraSession::setOutputLocation(const QUrl &sink)
 {
-    qDebug() << "S60CameraSession::setOutputlocation";
+    //qDebug() << "S60CameraSession::setOutputlocation";
     m_sink = sink;
     return true;
 }
 
 QUrl S60CameraSession::outputLocation() const
 {
-    qDebug() << "S60CameraSession::outputLocation";
+    //qDebug() << "S60CameraSession::outputLocation";
     return m_sink;
 }
 
 qint64 S60CameraSession::position()
 {
-    qDebug() << "S60CameraSession::position";
+    //qDebug() << "S60CameraSession::position";
     qint64 position = 0;
     if ( (m_captureState == ERecording) && m_videoUtility) {
         TRAPD(err, position = m_videoUtility->DurationL().Int64() / 1000);
@@ -385,7 +385,7 @@ qint64 S60CameraSession::position()
 
 int S60CameraSession::state() const
 {
-    qDebug() << "S60CameraSession::state";
+    //qDebug() << "S60CameraSession::state";
     return m_state;
 }
 
@@ -484,7 +484,7 @@ void S60CameraSession::stopRecording()
 
 void S60CameraSession::MceoCameraReady()
 {
-    qDebug() << "S60CameraSession::MCeoCameraReady()";
+    //qDebug() << "S60CameraSession::MCeoCameraReady()";
     m_state = QCamera::ActiveState;
     emit stateChanged(m_state);
     if (m_cameraEngine) {
@@ -500,15 +500,15 @@ void S60CameraSession::MceoCameraReady()
 
 void S60CameraSession::MceoFocusComplete()
 {
-    qDebug() << "S60CameraSession::MCeoFocusComplete()";
+    //qDebug() << "S60CameraSession::MCeoFocusComplete()";
     emit focusStatusChanged(QCamera::FocusReached);
 }
 
 void S60CameraSession::MceoCapturedDataReady(TDesC8* aData)
 {
-    qDebug() << "S60CameraSession::MceoCapturedDataReady()";
+    //qDebug() << "S60CameraSession::MceoCapturedDataReady()";
     QImage snapImage = QImage::fromData((const uchar *)aData->Ptr(), aData->Length());
-    qDebug() << "S60CameraSession::MceoCapturedDataReady(), image constructed, byte count="<<snapImage.byteCount();
+    //qDebug() << "S60CameraSession::MceoCapturedDataReady(), image constructed, byte count="<<snapImage.byteCount();
     // inform capture done
     emit imageCaptured(m_stillCaptureFileName, snapImage);
     // try to save image and inform if it was succcesful
@@ -528,12 +528,12 @@ void S60CameraSession::releaseImageBuffer()
 
 void S60CameraSession::MceoCapturedBitmapReady(CFbsBitmap* aBitmap)
 {
-    qDebug() << "S60CameraSession::MceoCapturedBitmapReady()";
+    //qDebug() << "S60CameraSession::MceoCapturedBitmapReady()";
     if(aBitmap)
     {
         TSize size = aBitmap->SizeInPixels();
         TUint32 sizeInWords = size.iHeight * CFbsBitmap::ScanLineLength(size.iWidth, aBitmap->DisplayMode()) / sizeof( TUint32 );
-        qDebug() << "S60CameraSession::MceoCapturedDataReady(), image constructed";
+        //qDebug() << "S60CameraSession::MceoCapturedDataReady(), image constructed";
         TUint32 *pixelData = new TUint32[sizeInWords];
 
         if (!pixelData)
@@ -579,7 +579,7 @@ void S60CameraSession::MceoCapturedBitmapReady(CFbsBitmap* aBitmap)
                 size.iHeight,
                 CFbsBitmap::ScanLineLength(size.iWidth, aBitmap->DisplayMode()),
                 format);
-        qDebug() << "S60CameraSession::MceoCapturedDataReady(), image constructed, byte count="<<snapImage->byteCount();
+        //qDebug() << "S60CameraSession::MceoCapturedDataReady(), image constructed, byte count="<<snapImage->byteCount();
         aBitmap = NULL;
 
         emit imageCaptured(m_stillCaptureFileName, *snapImage);
@@ -608,8 +608,8 @@ void S60CameraSession::MceoViewFinderFrameReady(CFbsBitmap& aFrame)
 
 void S60CameraSession::MceoHandleError(TCameraEngineError aErrorType, TInt aError)
 {
-    qDebug() << "S60CameraSession::MceoHandleError, errorType"<<aErrorType;
-    qDebug() << "S60CameraSession::MceoHandleError, aError"<<aError;
+    //qDebug() << "S60CameraSession::MceoHandleError, errorType"<<aErrorType;
+    //qDebug() << "S60CameraSession::MceoHandleError, aError"<<aError;
     Q_UNUSED(aErrorType);
     setError(aError);
 }
@@ -617,7 +617,7 @@ void S60CameraSession::MceoHandleError(TCameraEngineError aErrorType, TInt aErro
 // For S60Cameravideodevicecontrol
 int S60CameraSession::deviceCount()
 {
-    qDebug() << "S60CameraSession::deviceCount(for emulator this is always 1)";
+    //qDebug() << "S60CameraSession::deviceCount(for emulator this is always 1)";
     #ifdef Q_CC_NOKIAX86
     return 1;
     #endif
@@ -677,12 +677,12 @@ int S60CameraSession::defaultDevice() const
 }
 int S60CameraSession::selectedDevice() const
 {
-    qDebug() << "S60CameraSession::selectedDevice returning="<<m_deviceIndex;
+    //qDebug() << "S60CameraSession::selectedDevice returning="<<m_deviceIndex;
     return m_deviceIndex;
 }
 void S60CameraSession::setSelectedDevice(int index)
 {
-    qDebug() << "S60CameraSession::setSelectedDevice,index="<<index;
+    //qDebug() << "S60CameraSession::setSelectedDevice,index="<<index;
     m_deviceIndex = index;
 }
 
@@ -693,7 +693,7 @@ void S60CameraSession::setSelectedDevice(int index)
  */
 bool S60CameraSession::queryCurrentCameraInfo()
 {
-    qDebug() << "S60CameraSession::queryCameraInfo";
+    //qDebug() << "S60CameraSession::queryCameraInfo";
 
     /** Version number and name of camera hardware. */
     //TVersion iHardwareVersion;
@@ -716,37 +716,37 @@ bool S60CameraSession::queryCurrentCameraInfo()
 // End for S60Cameravideodevicecontrol
 QSize S60CameraSession::captureSize() const
 {
-    qDebug() << "S60CameraSession::captureSize";
+    //qDebug() << "S60CameraSession::captureSize";
     return m_captureSize;
 }
 QSize S60CameraSession::minimumCaptureSize()
 {
-    qDebug() << "S60CameraSession::minimunCaptureSize";
+    //qDebug() << "S60CameraSession::minimunCaptureSize";
     return supportedCaptureSizesForCodec(formatMap().key(m_currentcodec)).first();
 }
 QSize S60CameraSession::maximumCaptureSize()
 {
-    qDebug() << "S60CameraSession::maximumCaptureSize";
+    //qDebug() << "S60CameraSession::maximumCaptureSize";
     return supportedCaptureSizesForCodec(formatMap().key(m_currentcodec)).last();
 }
 
 void S60CameraSession::setCaptureSize(const QSize &size)
 {
-    qDebug() << "S60CameraSession::setCaptureSizes, size="<<size;
+    //qDebug() << "S60CameraSession::setCaptureSizes, size="<<size;
     if (m_captureSize.isNull() || size.isEmpty()) {
         //an empty QSize indicates the encoder should make an optimal choice based on what is
         //available from the image source and the limitations of the codec.
         m_captureSize = supportedCaptureSizesForCodec(formatMap().key(m_currentcodec)).last();
-        qDebug() << "S60CameraSession::setCaptureSizes, using optimal(last) size="<<m_captureSize;
+        //qDebug() << "S60CameraSession::setCaptureSizes, using optimal(last) size="<<m_captureSize;
     }
     else
         m_captureSize = size;
-    qDebug() << "S60CameraSession::setCaptureSizes, END size="<<size;
+    //qDebug() << "S60CameraSession::setCaptureSizes, END size="<<size;
 }
 
 QList<QSize> S60CameraSession::supportedCaptureSizesForCodec(const QString &codecName)
 {
-    qDebug() << "S60CameraSession::supportedCaptureSizesForCodec, codec="<<codecName;
+    //qDebug() << "S60CameraSession::supportedCaptureSizesForCodec, codec="<<codecName;
     QList<QSize> list;
     // if we have cameraengine loaded and we can update camerainfo
     if (m_cameraEngine && queryCurrentCameraInfo()) {
@@ -822,7 +822,7 @@ QMap<QString, int> S60CameraSession::formatDescMap()
 }
 QStringList S60CameraSession::supportedImageCaptureCodecs()
 {
-    qDebug() << "S60CameraSession::supportedImageCaptureCodecs";
+    //qDebug() << "S60CameraSession::supportedImageCaptureCodecs";
     QStringList list;
     #ifdef Q_CC_NOKIAX86
     return formatMap().keys();
@@ -831,13 +831,13 @@ QStringList S60CameraSession::supportedImageCaptureCodecs()
     for (int i = 0; i < m_formats.length() ; i++) {
         list << formatMap().key(m_formats.at(i));
     }
-    qDebug()<< "S60CameraSession::supportedImageCaptureCodecs, return formatList.count()="<<list.count();
+    //qDebug()<< "S60CameraSession::supportedImageCaptureCodecs, return formatList.count()="<<list.count();
     return list;
 }
 void S60CameraSession::updateImageCaptureCodecs()
 {
     m_formats.clear();
-    qDebug() << "S60CameraSession::updateImageCaptureCodecs START";
+    //qDebug() << "S60CameraSession::updateImageCaptureCodecs START";
     if (m_cameraEngine && queryCurrentCameraInfo()) {
 
         TUint32 supportedFormats = m_info.iImageFormatsSupported;
@@ -846,36 +846,36 @@ void S60CameraSession::updateImageCaptureCodecs()
 
         for ( int i = 0; i < allFormats.count() ; ++i ) {
             if ( supportedFormats & formatMask ) {
-                qDebug() << "S60CameraSession::updateImageCaptureCodecs, adding format="<<allFormats.at(i);
+                //qDebug() << "S60CameraSession::updateImageCaptureCodecs, adding format="<<allFormats.at(i);
                 m_formats << i; // store index of supported format
             }
 
             formatMask <<= 1;
         }
     }
-    qDebug() << "S60CameraSession::updateImageCaptureCodecs END";
+    //qDebug() << "S60CameraSession::updateImageCaptureCodecs END";
 }
 
 QString S60CameraSession::imageCaptureCodec()
 {
-    qDebug() << "S60CameraSession::imageCaptureCodec";
+    //qDebug() << "S60CameraSession::imageCaptureCodec";
     return formatMap().key(m_currentcodec);
 }
 void S60CameraSession::setImageCaptureCodec(const QString &codecName)
 {
-    qDebug() << "S60CameraSession::setImageCaptureCodec, coded="<<codecName;
+    //qDebug() << "S60CameraSession::setImageCaptureCodec, coded="<<codecName;
     m_currentcodec = static_cast<CCamera::TFormat>( formatMap().value(codecName) );
 }
 
 QString S60CameraSession::imageCaptureCodecDescription(const QString &codecName)
 {
-    qDebug() << "S60CameraSession::imageCaptureCodecDescription, codename="<<codecName;
+    //qDebug() << "S60CameraSession::imageCaptureCodecDescription, codename="<<codecName;
     return formatDescMap().key(formatMap().value(codecName));
 }
 
 QtMedia::EncodingQuality S60CameraSession::captureQuality() const
 {
-    qDebug() << "S60CameraSession::CaptureQuality";
+    //qDebug() << "S60CameraSession::CaptureQuality";
     if (m_imageQuality <= 1) {
         return QtMedia::VeryLowQuality;
     }
@@ -886,7 +886,7 @@ QtMedia::EncodingQuality S60CameraSession::captureQuality() const
 
 void S60CameraSession::setCaptureQuality(QtMedia::EncodingQuality quality)
 {
-    qDebug() << "S60CameraSession::setCaptureQuality, EncodingQuality="<<quality;
+    //qDebug() << "S60CameraSession::setCaptureQuality, EncodingQuality="<<quality;
     switch (quality) {
     case QtMedia::VeryLowQuality:
         m_imageQuality = 1;
@@ -905,7 +905,7 @@ void S60CameraSession::setCaptureQuality(QtMedia::EncodingQuality quality)
 
 void S60CameraSession::setVideoRenderer(QObject *videoOutput)
 {
-    qDebug() << "S60CameraSession::setVideoRenderer, videoOutput="<<videoOutput;
+    //qDebug() << "S60CameraSession::setVideoRenderer, videoOutput="<<videoOutput;
     S60ViewFinderWidgetControl* viewFinderWidgetControl =
             qobject_cast<S60ViewFinderWidgetControl*>(videoOutput);
 
@@ -917,7 +917,7 @@ void S60CameraSession::setVideoRenderer(QObject *videoOutput)
 
 void S60CameraSession::setZoomFactor(qreal optical, qreal digital)
 {
-    qDebug() << "S60CameraSession::setZoomFactor, value(optical digital): " << optical << digital;
+    //qDebug() << "S60CameraSession::setZoomFactor, value(optical digital): " << optical << digital;
 
     if (m_cameraEngine && queryCurrentCameraInfo()) {
         CCamera *camera = m_cameraEngine->Camera();
@@ -925,14 +925,14 @@ void S60CameraSession::setZoomFactor(qreal optical, qreal digital)
             if (digital > m_info.iMaxZoom && digital <= m_info.iMaxDigitalZoom) { // digitalzoom
                 TRAPD(err, camera->SetDigitalZoomFactorL(digital));
                 setError(err);
-                qDebug() << "S60CameraSession::setDigitalZoomFactor error: " << m_error;
+                //qDebug() << "S60CameraSession::setDigitalZoomFactor error: " << m_error;
                 if (err == KErrNone) {
                     emit digitalZoomChanged(digital);
                 }
             } else if (optical >= m_info.iMinZoom && optical <= m_info.iMaxZoom) { //opticalzoom
                 TRAPD(err2, camera->SetZoomFactorL(optical));
                 setError(err2);
-                qDebug() << "S60CameraSession::setZoomFactor error: " << m_error;
+                //qDebug() << "S60CameraSession::setZoomFactor error: " << m_error;
                 if (err2 == KErrNone) {
                     emit opticalZoomChanged(optical);
                 }
@@ -943,7 +943,7 @@ void S60CameraSession::setZoomFactor(qreal optical, qreal digital)
 
 int S60CameraSession::zoomFactor()
 {
-    qDebug() << "S60CameraSession::zoomFactor";
+    //qDebug() << "S60CameraSession::zoomFactor";
     int factor = 0;
     if (m_cameraEngine) {
         CCamera *camera = m_cameraEngine->Camera();
@@ -954,7 +954,7 @@ int S60CameraSession::zoomFactor()
 
 int S60CameraSession::digitalZoomFactor()
 {
-    qDebug() << "S60CameraSession::digitalZoomFactor";
+    //qDebug() << "S60CameraSession::digitalZoomFactor";
     int factor = 0;
     if (m_cameraEngine) {
         CCamera *camera = m_cameraEngine->Camera();
@@ -965,7 +965,7 @@ int S60CameraSession::digitalZoomFactor()
 
 void S60CameraSession::startFocus()
 {
-    qDebug() << "S60CameraSession::startFocus";
+    //qDebug() << "S60CameraSession::startFocus";
 
     if (m_cameraEngine) {
         TRAPD(err, m_cameraEngine->StartFocusL());
@@ -975,7 +975,7 @@ void S60CameraSession::startFocus()
 
 void S60CameraSession::cancelFocus()
 {
-    qDebug() << "S60CameraSession::cancelFocus";
+    //qDebug() << "S60CameraSession::cancelFocus";
     if (m_cameraEngine) {
         TRAPD(err, m_cameraEngine->FocusCancel());
         setError(err);
@@ -984,10 +984,10 @@ void S60CameraSession::cancelFocus()
 
 int S60CameraSession::maximumZoom()
 {
-    qDebug() << "S60CameraSession::maximumZoom";
+    //qDebug() << "S60CameraSession::maximumZoom";
 
     if (queryCurrentCameraInfo()) {
-        qDebug() << "S60CameraSession::maximumZoom value: " << m_info.iMaxZoom;
+        //qDebug() << "S60CameraSession::maximumZoom value: " << m_info.iMaxZoom;
         return m_info.iMaxZoom;
     } else {
         return 0;
@@ -996,10 +996,10 @@ int S60CameraSession::maximumZoom()
 
 int S60CameraSession::minZoom()
 {
-    qDebug() << "S60CameraSession::minZoom";
+    //qDebug() << "S60CameraSession::minZoom";
 
     if (queryCurrentCameraInfo()) {
-        qDebug() << "S60CameraSession::minZoom value: " << m_info.iMinZoom;
+        //qDebug() << "S60CameraSession::minZoom value: " << m_info.iMinZoom;
         return m_info.iMinZoom;
     } else {
         return 0;
@@ -1008,9 +1008,9 @@ int S60CameraSession::minZoom()
 
 int S60CameraSession::maxDigitalZoom()
 {
-    qDebug() << "S60CameraSession::maxDigitalZoom";
+    //qDebug() << "S60CameraSession::maxDigitalZoom";
     if (queryCurrentCameraInfo()) {
-        qDebug() << "S60CameraSession::maxDigitalZoom value: " << m_info.iMaxDigitalZoom;
+        //qDebug() << "S60CameraSession::maxDigitalZoom value: " << m_info.iMaxDigitalZoom;
         return m_info.iMaxDigitalZoom;
     } else {
         return 0;
@@ -1391,12 +1391,12 @@ void S60CameraSession::updateVideoCaptureCodecsL()
     CleanupStack::PopAndDestroy(format);
     CleanupStack::PopAndDestroy(pluginParameters);
     
-    qDebug() << "S60CameraSession::updateVideoCaptureCodecs count: " << m_videoControllerMap.keys().count();
+    //qDebug() << "S60CameraSession::updateVideoCaptureCodecs count: " << m_videoControllerMap.keys().count();
 }
 
 QStringList S60CameraSession::supportedVideoCaptureCodecs()
 {
-    qDebug() << "S60CameraSession::supportedVideoCaptureCodecs";
+    //qDebug() << "S60CameraSession::supportedVideoCaptureCodecs";
     return m_videoControllerMap.keys();
 }
 
@@ -1484,7 +1484,7 @@ void S60CameraSession::initializeVideoCaptureSettings()
 
 void S60CameraSession::MvruoOpenComplete(TInt aError)
 {
-    qDebug() << "S60CameraSession::MvruoOpenComplete, error: " << aError;
+    //qDebug() << "S60CameraSession::MvruoOpenComplete, error: " << aError;
 
     if(aError==KErrNone) {
         commitVideoEncoderSettings();
@@ -1498,11 +1498,11 @@ void S60CameraSession::MvruoOpenComplete(TInt aError)
 
 void S60CameraSession::MvruoPrepareComplete(TInt aError)
 {
-    qDebug() << "S60CameraSession::MvruoPrepareComplete, error: " << aError;
+    //qDebug() << "S60CameraSession::MvruoPrepareComplete, error: " << aError;
     if(aError==KErrNone) {
         m_videoUtility->Record();
         m_captureState = ERecording;
-        qDebug() << "S60CameraSession::MvruoPrepareComplete: Record called";
+        //qDebug() << "S60CameraSession::MvruoPrepareComplete: Record called";
     } else {
         m_captureState = ENotInitialized;
     }
@@ -1512,7 +1512,7 @@ void S60CameraSession::MvruoPrepareComplete(TInt aError)
 
 void S60CameraSession::MvruoRecordComplete(TInt aError)
 {
-    qDebug() << "S60CameraSession::MvruoRecordComplete";
+    //qDebug() << "S60CameraSession::MvruoRecordComplete";
     if((aError==KErrNone) || (aError==KErrCompletion)) {
         m_videoUtility->Stop();
         m_videoUtility->Close();
diff --git a/plugins/multimedia/symbian/camera/s60camerasettings.cpp b/plugins/multimedia/symbian/camera/s60camerasettings.cpp
index 308f6b8934..e73b5d8eb1 100644
--- a/plugins/multimedia/symbian/camera/s60camerasettings.cpp
+++ b/plugins/multimedia/symbian/camera/s60camerasettings.cpp
@@ -91,11 +91,11 @@ void S60CameraSettings::setFocusMode(QCamera::FocusMode mode)
     if (m_advancedSettings) {
         switch(mode) {
             case QCamera::ManualFocus: // Manual focus mode
-                qDebug() << "Settings: set manual focus";
+                //qDebug() << "Settings: set manual focus";
                 m_advancedSettings->SetFocusMode(CCamera::CCameraAdvancedSettings::EFocusModeManual);
                 break;
             case QCamera::AutoFocus: // One-shot auto focus mode
-                qDebug() << "Settings: set auto focus";
+                //qDebug() << "Settings: set auto focus";
                 m_advancedSettings->SetAutoFocusType(CCamera::CCameraAdvancedSettings::EAutoFocusTypeSingle);
                 m_advancedSettings->SetFocusMode(CCamera::CCameraAdvancedSettings::EFocusModeAuto);
                 break;
diff --git a/plugins/multimedia/symbian/camera/s60cameravideodevicecontrol.cpp b/plugins/multimedia/symbian/camera/s60cameravideodevicecontrol.cpp
index e50d671675..aecc03c170 100644
--- a/plugins/multimedia/symbian/camera/s60cameravideodevicecontrol.cpp
+++ b/plugins/multimedia/symbian/camera/s60cameravideodevicecontrol.cpp
@@ -65,23 +65,23 @@ S60CameraVideoDeviceControl::~S60CameraVideoDeviceControl()
 
 int S60CameraVideoDeviceControl::deviceCount() const
 {
-    qDebug() << "S60CameraVideoDeviceControl::deviceCount" ;
+    //qDebug() << "S60CameraVideoDeviceControl::deviceCount" ;
     return S60CameraSession::deviceCount();
 }
 
 QString S60CameraVideoDeviceControl::deviceName(int index) const
 {
-    qDebug() << "S60CameraVideoDeviceControl::deviceName, index=" << index;
+    //qDebug() << "S60CameraVideoDeviceControl::deviceName, index=" << index;
     return S60CameraSession::name(index);
 }
 QString S60CameraVideoDeviceControl::deviceDescription(int index) const
 {
-    qDebug() << "S60CameraVideoDeviceControl::deviceDescription, index=" << index;
+    //qDebug() << "S60CameraVideoDeviceControl::deviceDescription, index=" << index;
     return S60CameraSession::description(index);
 }
 QIcon S60CameraVideoDeviceControl::deviceIcon(int index) const
 {
-    qDebug() << "S60CameraVideoDeviceControl::deviceIcon(), index="<<index;
+    //qDebug() << "S60CameraVideoDeviceControl::deviceIcon(), index="<<index;
     return QIcon();
 }
 int S60CameraVideoDeviceControl::defaultDevice() const
diff --git a/plugins/multimedia/v4l/v4lserviceplugin.cpp b/plugins/multimedia/v4l/v4lserviceplugin.cpp
index b0b27e4780..a9bb43e4ce 100644
--- a/plugins/multimedia/v4l/v4lserviceplugin.cpp
+++ b/plugins/multimedia/v4l/v4lserviceplugin.cpp
@@ -65,7 +65,7 @@ QMediaService* V4LServicePlugin::create(QString const& key)
     if (key == QLatin1String(Q_MEDIASERVICE_CAMERA))
         return new V4LCameraService;
 
-    qDebug() << "unsupported key:" << key;
+    //qDebug() << "unsupported key:" << key;
     return 0;
 }
 
diff --git a/src/multimedia/qxvideosurface_maemo5.cpp b/src/multimedia/qxvideosurface_maemo5.cpp
index 70782016d1..9d0920f51f 100644
--- a/src/multimedia/qxvideosurface_maemo5.cpp
+++ b/src/multimedia/qxvideosurface_maemo5.cpp
@@ -296,7 +296,7 @@ bool QXVideoSurface::start(const QVideoSurfaceFormat &format)
         m_shminfo.readOnly = False;
 
         if (!XShmAttach(QX11Info::display(), &m_shminfo)) {
-            qDebug() << "XShmAttach failed";
+            //qDebug() << "XShmAttach failed";
             return false;
         }