Mercurial Repositories > eric / file comparison
comparison: Helpviewer/HelpWindow.py
Helpviewer/HelpWindow.py
- changeset 3656
- 441956d8fce5
- parent 3591
- 2f2a4a76dd22
- child 3670
- f0cb7579c0b4
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 13 except NameError: | 13 except NameError: |
| 14 pass | 14 pass |
| 15 | 15 |
| 16 import os | 16 import os |
| 17 | 17 |
| 18 from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, \ | 18 from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, \ |
| 19 QUrl, QThread, QTextCodec | 19 QUrl, QThread, QTextCodec |
| 20 from PyQt4.QtGui import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \ | 20 from PyQt5.QtGui import QDesktopServices, QKeySequence, QFont, QFontMetrics, \ |
| 21 QDesktopServices, QKeySequence, QComboBox, QFont, QFontMetrics, QLabel, \ | 21 QIcon |
| 22 QSplitter, QMenu, QToolButton, QLineEdit, QApplication, QWhatsThis, \ | 22 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \ |
| 23 QDialog, QHBoxLayout, QProgressBar, QAction, QIcon | 23 QComboBox, QLabel, QSplitter, QMenu, QToolButton, QLineEdit, \ |
| 24 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest | 24 QApplication, QWhatsThis, QDialog, QHBoxLayout, QProgressBar, QAction |
| 25 from PyQt4.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin, \ | 25 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest |
| 26 QWebPage | 26 from PyQt5.QtWebKit import QWebSettings, QWebDatabase, QWebSecurityOrigin |
| 27 from PyQt5.QtWebKitWidgets import QWebPage | |
| 27 try: | 28 try: |
| 28 from PyQt4.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery | 29 from PyQt5.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery |
| 29 QTHELP_AVAILABLE = True | 30 QTHELP_AVAILABLE = True |
| 30 except ImportError: | 31 except ImportError: |
| 31 QTHELP_AVAILABLE = False | 32 QTHELP_AVAILABLE = False |
| 32 | 33 |
| 33 from .Network.NetworkAccessManager import SSL_AVAILABLE | 34 from .Network.NetworkAccessManager import SSL_AVAILABLE |
