##// END OF EJS Templates
Merge pull request #963 from minrk/pyside...
Min RK -
r5286:23b354bf merge
parent child Browse files
Show More
@@ -7,6 +7,7 b' import time'
7
7
8 # System library imports
8 # System library imports
9 from pygments.lexers import PythonLexer
9 from pygments.lexers import PythonLexer
10 from IPython.external import qt
10 from IPython.external.qt import QtCore, QtGui
11 from IPython.external.qt import QtCore, QtGui
11
12
12 # Local imports
13 # Local imports
@@ -118,6 +119,13 b' class FrontendWidget(HistoryConsoleWidget, BaseFrontendMixin):'
118
119
119 def __init__(self, *args, **kw):
120 def __init__(self, *args, **kw):
120 super(FrontendWidget, self).__init__(*args, **kw)
121 super(FrontendWidget, self).__init__(*args, **kw)
122 # FIXME: remove this when PySide min version is updated past 1.0.7
123 # forcefully disable calltips if PySide is < 1.0.7, because they crash
124 if qt.QT_API == qt.QT_API_PYSIDE:
125 import PySide
126 if PySide.__version_info__ < (1,0,7):
127 self.log.warn("PySide %s < 1.0.7 detected, disabling calltips" % PySide.__version__)
128 self.enable_calltips = False
121
129
122 # FrontendWidget protected variables.
130 # FrontendWidget protected variables.
123 self._bracket_matcher = BracketMatcher(self._control)
131 self._bracket_matcher = BracketMatcher(self._control)
General Comments 0
You need to be logged in to leave comments. Login now