Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I42587537cadade4b3f45df18385adb760fb24430

diff --cc tests/auto/unit/qcamera/tst_qcamera.cpp
index e61c140,3bbbc36..61dd05b
--- 1/tests/auto/unit/qcamera/tst_qcamera.cpp
--- 2/tests/auto/unit/qcamera/tst_qcamera.cpp
+++ b/tests/auto/unit/qcamera/tst_qcamera.cpp
@@@ -1125,22 -1126,24 +1126,24 @@@ void tst_QCamera::testSetVideoOutputDes
  
  void tst_QCamera::testEnumDebug()
  {
 -    QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveState ");
 +    QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveState");
      qDebug() << QCamera::ActiveState;
 -    QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveStatus ");
 +    QTest::ignoreMessage(QtDebugMsg, "QCamera::ActiveStatus");
      qDebug() << QCamera::ActiveStatus;
 -    QTest::ignoreMessage(QtDebugMsg, "QCamera::CaptureVideo ");
 +    QTest::ignoreMessage(QtDebugMsg, "QCamera::CaptureVideo");
      qDebug() << QCamera::CaptureVideo;
 -    QTest::ignoreMessage(QtDebugMsg, "QCamera::CameraError ");
 +    QTest::ignoreMessage(QtDebugMsg, "QCamera::CameraError");
      qDebug() << QCamera::CameraError;
 -    QTest::ignoreMessage(QtDebugMsg, "QCamera::Unlocked ");
 +    QTest::ignoreMessage(QtDebugMsg, "QCamera::Unlocked");
      qDebug() << QCamera::Unlocked;
 -    QTest::ignoreMessage(QtDebugMsg, "QCamera::LockAcquired ");
 +    QTest::ignoreMessage(QtDebugMsg, "QCamera::LockAcquired");
      qDebug() << QCamera::LockAcquired;
 -    QTest::ignoreMessage(QtDebugMsg, "QCamera::NoLock ");
 +    QTest::ignoreMessage(QtDebugMsg, "QCamera::NoLock");
      qDebug() << QCamera::NoLock;
 -    QTest::ignoreMessage(QtDebugMsg, "QCamera::LockExposure ");
 +    QTest::ignoreMessage(QtDebugMsg, "QCamera::LockExposure");
      qDebug() << QCamera::LockExposure;
+     QTest::ignoreMessage(QtDebugMsg, "QCamera::FrontFace ");
+     qDebug() << QCamera::FrontFace;
  }
  
  void tst_QCamera::testCameraControl()