Mercurial Repositories > eric / file diff

diff -r ffeb85cdc72d -r 441956d8fce5 Preferences/ConfigurationPages/EditorStylesPage.py
--- a/Preferences/ConfigurationPages/EditorStylesPage.py	Sun Jun 29 14:00:30 2014 +0200
+++ b/Preferences/ConfigurationPages/EditorStylesPage.py	Sun Jun 29 20:13:56 2014 +0200
@@ -9,9 +9,10 @@
 
 from __future__ import unicode_literals
 
-from PyQt4.QtCore import pyqtSlot
-from PyQt4.QtGui import QColor, QPalette, QColorDialog
-from PyQt4.Qsci import QsciScintilla
+from PyQt5.QtCore import pyqtSlot
+from PyQt5.QtGui import QColor, QPalette
+from PyQt5.QtWidgets import QColorDialog
+from PyQt5.Qsci import QsciScintilla
 
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EditorStylesPage import Ui_EditorStylesPage
@@ -31,8 +32,8 @@
         self.setupUi(self)
         self.setObjectName("EditorStylesPage")
         
-        from QScintilla.QsciScintillaCompat import (
-            QsciScintillaCompat, QSCINTILLA_VERSION)
+        from QScintilla.QsciScintillaCompat import QsciScintillaCompat, \
+            QSCINTILLA_VERSION
         self.foldStyles = [
             QsciScintilla.PlainFoldStyle,
             QsciScintilla.CircledFoldStyle,