Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sun Jun 29 14:00:30 2014 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgConflictsListDialog.py	Sun Jun 29 20:13:56 2014 +0200
@@ -12,10 +12,10 @@
 
 import os
 
-from PyQt4.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
-from PyQt4.QtGui import (
-    QWidget, QAbstractButton, QDialogButtonBox, QHeaderView, QTreeWidgetItem,
-    QLineEdit, QApplication)
+from PyQt5.QtCore import pyqtSlot, Qt, QPoint, QProcess, QTimer
+from PyQt5.QtGui import QWidget
+from PyQt5.QtWidgets import QAbstractButton, QDialogButtonBox, QHeaderView, \
+    QTreeWidgetItem, QLineEdit, QApplication
 
 from E5Gui import E5MessageBox
 from E5Gui.E5Application import e5App