Merge lp:~mzibricky/openlp/bug-907857 into lp:openlp

[matysek]

Fix for display screen on mac.

[Jonathan Corwin (j-corwin)]

review: Approve

[Raoul Snyman (raoul-snyman)]

review: Approve

=== modified file 'openlp/core/ui/maindisplay.py'
--- openlp/core/ui/maindisplay.py	2011-12-22 13:23:04 +0000
+++ openlp/core/ui/maindisplay.py	2011-12-22 18:35:29 +0000
@@ -30,6 +30,7 @@
 """
 import logging
 import os
+import sys
 
 from PyQt4 import QtCore, QtGui, QtWebKit, QtOpenGL
 from PyQt4.phonon import Phonon
@@ -61,7 +62,12 @@
         self.controller = controller
         self.screen = {}
         self.plugins = PluginManager.get_instance().plugins
-        self.setViewport(QtOpenGL.QGLWidget())
+        # FIXME: On Mac OS X (tested on 10.7) the display screen is corrupt with
+        # OpenGL. Only white blank screen is shown on the 2nd monitor all the
+        # time. We need to investigate more how to use OpenGL properly on Mac OS
+        # X.
+        if sys.platform != 'darwin':
+            self.setViewport(QtOpenGL.QGLWidget())
 
     def setup(self):
         """