← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~m2j/openlp/bug-902115 into lp:openlp

 

Meinert Jordan has proposed merging lp:~m2j/openlp/bug-902115 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~m2j/openlp/bug-902115/+merge/94684

Current Debian Testing has PyQt 4.9 but not Qt 4.8 yet.
-- 
https://code.launchpad.net/~m2j/openlp/bug-902115/+merge/94684
Your team OpenLP Core is requested to review the proposed merge of lp:~m2j/openlp/bug-902115 into lp:openlp.
=== modified file 'openlp/core/lib/__init__.py'
--- openlp/core/lib/__init__.py	2012-02-25 18:31:02 +0000
+++ openlp/core/lib/__init__.py	2012-02-26 15:20:23 +0000
@@ -328,7 +328,7 @@
     ``stringlist``
         List of unicode strings
     """
-    if Qt.PYQT_VERSION_STR >= u'4.9':
+    if Qt.PYQT_VERSION_STR >= u'4.9' and Qt.qVersion() >= u'4.8':
         return unicode(QtCore.QLocale().createSeparatedList(stringlist))
     if not stringlist:
         return u''


Follow ups