From: Mohammed Sameer <msameer@foolab.org>
Date: Sun, 28 Jul 2013 15:38:32 +0000 (+0300)
Subject: More fixes for Qt5
X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=b431d72c5b827805cf1e9b0d94869501fde01c52;p=harmattan%2Fcameraplus

More fixes for Qt5
---

diff --git a/declarative/videoplayer.cpp b/declarative/videoplayer.cpp
index 8b6310a..7110d77 100644
--- a/declarative/videoplayer.cpp
+++ b/declarative/videoplayer.cpp
@@ -50,6 +50,12 @@ VideoPlayer::VideoPlayer(QQuickItem *parent) :
 #if defined(QT4)
   setFlag(QGraphicsItem::ItemHasNoContents, false);
 #endif
+
+#if defined(QT5)
+  setRenderTarget(QQuickPaintedItem::FramebufferObject);
+  setSmooth(false);
+  setAntialiasing(false);
+#endif
 }
 
 VideoPlayer::~VideoPlayer() {
@@ -239,10 +245,14 @@ void VideoPlayer::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
 
   Q_UNUSED(widget);
   Q_UNUSED(option);
+
+  painter->fillRect(boundingRect(), Qt::black);
+
 #elif defined(QT5)
 void VideoPlayer::paint(QPainter *painter) {
+  painter->fillRect(contentsBoundingRect(), Qt::black);
+
 #endif
-  painter->fillRect(boundingRect(), Qt::black);
 
   if (!m_renderer) {
     return;
diff --git a/declarative/viewfinder.cpp b/declarative/viewfinder.cpp
index c0cbd8f..377adb7 100644
--- a/declarative/viewfinder.cpp
+++ b/declarative/viewfinder.cpp
@@ -47,6 +47,12 @@ Viewfinder::Viewfinder(QQuickItem *parent) :
 #if defined(QT4)
   setFlag(QGraphicsItem::ItemHasNoContents, false);
 #endif
+
+#if defined(QT5)
+  setRenderTarget(QQuickPaintedItem::FramebufferObject);
+  setSmooth(false);
+  setAntialiasing(false);
+#endif
 }
 
 Viewfinder::~Viewfinder() {
@@ -134,10 +140,11 @@ void Viewfinder::paint(QPainter *painter, const QStyleOptionGraphicsItem *option
 
   Q_UNUSED(widget);
   Q_UNUSED(option);
+  painter->fillRect(boundingRect(), Qt::black);
 #elif defined(QT5)
 void Viewfinder::paint(QPainter *painter) {
+  painter->fillRect(contentsBoundingRect(), Qt::black);
 #endif
-  painter->fillRect(boundingRect(), Qt::black);
 
   if (!m_renderer || !m_enabled) {
     return;