[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phonon-gstreamer/1.0-porting-for-merge] gstreamer: Fix merge ifdef properly
From:       Rohan Garg <rohan () kde ! org>
Date:       2014-04-03 13:14:02
Message-ID: E1WVhT0-0003fe-4k () scm ! kde ! org
[Download RAW message or body]

Git commit 8c1bd03da9b442ddff4d450871044c31c8b56093 by Rohan Garg.
Committed on 02/04/2014 at 14:30.
Pushed by garg into branch '1.0-porting-for-merge'.

Fix merge ifdef properly

M  +1    -1    gstreamer/x11renderer.cpp

http://commits.kde.org/phonon-gstreamer/8c1bd03da9b442ddff4d450871044c31c8b=
56093

diff --git a/gstreamer/x11renderer.cpp b/gstreamer/x11renderer.cpp
index b2597f0..c730ad7 100644
--- a/gstreamer/x11renderer.cpp
+++ b/gstreamer/x11renderer.cpp
@@ -203,6 +203,7 @@ void X11Renderer::windowExposed()
 //     QApplication::syncX();
 #else
     QApplication::syncX();
+#endif //QT_VERSION
     if (m_videoSink &&
         #if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
             GST_IS_X_OVERLAY(m_videoSink)
@@ -215,7 +216,6 @@ void X11Renderer::windowExposed()
 #else
         gst_video_overlay_expose(GST_VIDEO_OVERLAY(m_videoSink));
 #endif
-#endif //QT_VERSION
 }
 =

 }

[prev in list] [next in list] [prev in thread] [next in thread]