diff --git a/qtribu/logic/__init__.py b/qtribu/logic/__init__.py index 51ea86e4..f76fcbbb 100644 --- a/qtribu/logic/__init__.py +++ b/qtribu/logic/__init__.py @@ -2,4 +2,3 @@ from .custom_datatypes import RssItem # noqa: F401 from .rss_reader import RssMiniReader # noqa: F401 from .splash_changer import SplashChanger # noqa: F401 -from .web_viewer import WebViewer # noqa: F401 diff --git a/qtribu/logic/web_viewer.py b/qtribu/logic/web_viewer.py index bece78c2..64ba3780 100644 --- a/qtribu/logic/web_viewer.py +++ b/qtribu/logic/web_viewer.py @@ -16,14 +16,13 @@ # PyQGIS from qgis.PyQt.QtCore import QCoreApplication, Qt from qgis.PyQt.QtGui import QDesktopServices +from qgis.PyQt.QtWidgets import QVBoxLayout, QWidget try: - from qgis.PyQt.QtWebKitWidgets import QWebView -except: QCoreApplication.setAttribute(Qt.AA_ShareOpenGLContexts) - from PyQt.QtWebEngineWidgets import QWebEngineView as QWebView - -from qgis.PyQt.QtWidgets import QVBoxLayout, QWidget + from qgis.PyQt.QtWebEngineWidgets import QWebEngineView as QWebView +except Exception: + from qgis.PyQt.QtWebKitWidgets import QWebView # project from qtribu.toolbelt import NetworkRequestsManager, PlgLogger, PlgOptionsManager diff --git a/qtribu/toolbelt/commons.py b/qtribu/toolbelt/commons.py index b24c1e0f..0eea3d09 100644 --- a/qtribu/toolbelt/commons.py +++ b/qtribu/toolbelt/commons.py @@ -1,7 +1,7 @@ from qgis.PyQt.QtCore import QUrl from qgis.PyQt.QtGui import QDesktopServices -from qtribu.logic import WebViewer +from qtribu.logic.web_viewer import WebViewer web_viewer = WebViewer()