This commit is contained in:
Florian Bruhin 2017-03-01 11:12:28 +01:00
parent 642afb0aff
commit 1e42fd1319
2 changed files with 2 additions and 2 deletions

View File

@ -262,7 +262,7 @@ def get_backend(args):
def check_qt_version(backend): def check_qt_version(backend):
"""Check if the Qt version is recent enough.""" """Check if the Qt version is recent enough."""
from PyQt5.QtCore import qVersion, PYQT_VERSION, PYQT_VERSION_STR from PyQt5.QtCore import PYQT_VERSION, PYQT_VERSION_STR
from qutebrowser.utils import qtutils, version from qutebrowser.utils import qtutils, version
if (qtutils.version_check('5.2.0', operator.lt, strict=True) or if (qtutils.version_check('5.2.0', operator.lt, strict=True) or
PYQT_VERSION < 0x050200): PYQT_VERSION < 0x050200):

View File

@ -66,7 +66,7 @@ def test_version_check(monkeypatch, qversion, compiled, version, op, expected):
""" """
monkeypatch.setattr('qutebrowser.utils.qtutils.qVersion', lambda: qversion) monkeypatch.setattr('qutebrowser.utils.qtutils.qVersion', lambda: qversion)
if compiled is not None: if compiled is not None:
monkeypatch.setattr('qutebrowser.utils.qtutils.QT_VERSION_STR', compiled) monkeypatch.setattr(qtutils, 'QT_VERSION_STR', compiled)
strict = True strict = True
else: else:
strict = False strict = False