diff -r 0c7a44af84bc -r 962bce857696 eric7/WebBrowser/WebBrowserWindow.py --- a/eric7/WebBrowser/WebBrowserWindow.py Sun May 16 11:43:59 2021 +0200 +++ b/eric7/WebBrowser/WebBrowserWindow.py Sun May 16 20:07:24 2021 +0200 @@ -13,21 +13,23 @@ import functools import contextlib -from PyQt5.QtCore import ( +from PyQt6.QtCore import ( pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, QProcess, QEvent, QFileInfo ) -from PyQt5.QtGui import QDesktopServices, QKeySequence, QFont, QFontMetrics -from PyQt5.QtWidgets import ( +from PyQt6.QtGui import ( + QDesktopServices, QKeySequence, QAction, QFont, QFontMetrics +) +from PyQt6.QtWidgets import ( QWidget, QVBoxLayout, QSizePolicy, QDockWidget, QComboBox, QLabel, QMenu, QLineEdit, QApplication, QWhatsThis, QDialog, QHBoxLayout, QProgressBar, - QInputDialog, QAction + QInputDialog ) -from PyQt5.QtWebEngineWidgets import ( +from PyQt6.QtWebEngineWidgets import ( QWebEngineSettings, QWebEnginePage, QWebEngineProfile, QWebEngineScript ) try: - from PyQt5.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery + from PyQt6.QtHelp import QHelpEngine, QHelpEngineCore QTHELP_AVAILABLE = True except ImportError: QTHELP_AVAILABLE = False @@ -3527,9 +3529,7 @@ ): self.__searchDock.show() self.__searchDock.raise_() - query = QHelpSearchQuery(QHelpSearchQuery.FieldName.DEFAULT, - [self.__searchWord]) - self.__searchEngine.search([query]) + self.__searchEngine.search(self.__searchWord) self.__searchWord = None def search(self, word):