Mercurial Repositories > eric / file diff

--- a/eric6/WebBrowser/History/HistoryMenu.py	Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/History/HistoryMenu.py	Tue Mar 02 17:17:09 2021 +0100
@@ -321,11 +321,11 @@
         
         @param idx index of the activated item (QModelIndex)
         """
-        if self._keyboardModifiers & Qt.ControlModifier:
+        if self._keyboardModifiers & Qt.KeyboardModifier.ControlModifier:
             self.newTab.emit(
                 idx.data(HistoryModel.UrlRole),
                 idx.data(HistoryModel.TitleRole))
-        elif self._keyboardModifiers & Qt.ShiftModifier:
+        elif self._keyboardModifiers & Qt.KeyboardModifier.ShiftModifier:
             self.newWindow.emit(
                 idx.data(HistoryModel.UrlRole),
                 idx.data(HistoryModel.TitleRole))
@@ -435,7 +435,8 @@
         self.__closedTabsMenu.clear()
         index = 0
         for tab in self.__tabWidget.closedTabsManager().allClosedTabs():
-            title = fm.elidedText(tab.title, Qt.ElideRight, maxWidth)
+            title = fm.elidedText(tab.title, Qt.TextElideMode.ElideRight,
+                                  maxWidth)
             act = self.__closedTabsMenu.addAction(
                 WebBrowser.WebBrowserWindow.WebBrowserWindow.icon(tab.url),
                 title)
@@ -499,11 +500,11 @@
         
         @param idx index of the activated item (QModelIndex)
         """
-        if self._keyboardModifiers & Qt.ControlModifier:
+        if self._keyboardModifiers & Qt.KeyboardModifier.ControlModifier:
             self.newTab.emit(
                 idx.data(HistoryModel.UrlRole),
                 idx.data(HistoryModel.TitleRole))
-        elif self._keyboardModifiers & Qt.ShiftModifier:
+        elif self._keyboardModifiers & Qt.KeyboardModifier.ShiftModifier:
             self.newWindow.emit(
                 idx.data(HistoryModel.UrlRole),
                 idx.data(HistoryModel.TitleRole))