From ff2e17a29fcdf186adb8eed06e3b2b13cdee96c2 Mon Sep 17 00:00:00 2001 From: Jeremy Mack Wright Date: Thu, 26 Apr 2018 10:27:08 -0400 Subject: [PATCH] Fixed an import bug between Qt5.8 and Qt5.9. --- Libs/pyqode/qt/QtCore.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Libs/pyqode/qt/QtCore.py b/Libs/pyqode/qt/QtCore.py index 342df9e..ae4b93e 100644 --- a/Libs/pyqode/qt/QtCore.py +++ b/Libs/pyqode/qt/QtCore.py @@ -27,7 +27,11 @@ elif os.environ[QT_API] in PYQT4_API: from PyQt4.QtCore import QT_VERSION_STR as __version__ elif os.environ[QT_API] in PYSIDE_API: from PySide.QtCore import * - from PySide.QtGui import QSortFilterProxyModel + # If we can't import QSortFilterProxyModel it's probably because it was already imported in QtCore + try: + from PySide.QtGui import QSortFilterProxyModel + except: + pass # use a common __version__ import PySide.QtCore __version__ = PySide.QtCore.__version__