spv-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 59
committer: F.A. Bourbonnais <bouf10pub@xxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2011-01-05 22:40:30 -0500
message:
  Check the real QT version not PyQt
modified:
  slidepresenterview/__init__.py


--
lp:slidepresenterview
https://code.launchpad.net/~spv-dev/slidepresenterview/trunk

Your team SlidePresenterView Development Team is subscribed to branch lp:slidepresenterview.
To unsubscribe from this branch go to https://code.launchpad.net/~spv-dev/slidepresenterview/trunk/+edit-subscription

=== modified file 'slidepresenterview/__init__.py'
--- slidepresenterview/__init__.py	2010-01-07 04:29:41 +0000
+++ slidepresenterview/__init__.py	2011-01-06 03:40:30 +0000
@@ -158,7 +158,7 @@
     """
     return (
         _check_python() and
-        _check_pyqt() and 
+        _check_qt() and 
         _check_pypoppler()
         )
 
@@ -170,13 +170,13 @@
     
     return True
     
-def _check_pyqt():
+def _check_qt():
     try:
         from PyQt4 import QtCore
         from PyQt4 import QtGui # pylint: disable-msg=W0612
         from PyQt4 import QtXml # pylint: disable-msg=W0612
         
-        qt_version_str = QtCore.PYQT_VERSION_STR
+        qt_version_str = QtCore.QT_VERSION_STR
         qt_version = tuple(imap(int, qt_version_str.split('.')))
         
     except ImportError:
@@ -184,12 +184,12 @@
         print >> sys.stderr, "        QtCore, QtGui and QtXml are required."
         return False
     
-    if qt_version < (4, 4):
-        print >> sys.stderr, "[ERROR] PyQt version is too old."
+    if qt_version < (4, 6):
+        print >> sys.stderr, "[ERROR] Qt version is too old."
         print >> sys.stderr, (
-            "        Current PyQt version is %s" % qt_version_str 
+            "        Current Qt version is %s" % qt_version_str 
             )
-        print >> sys.stderr, "        You need PyQt version >= 4.4."
+        print >> sys.stderr, "        You need Qt version >= 4.6."
         return False
     
     return True