widgets/gui: Handle missing QtWebKitWidgets

Author: ales-erjavec

Orange/widgets/gui.py

@@ -11,7 +11,7 @@
 
 import pkg_resources
 
-from AnyQt import QtWidgets, QtCore, QtGui, QtWebKitWidgets
+from AnyQt import QtWidgets, QtCore, QtGui
 from AnyQt.QtCore import Qt, Signal, Slot
 from AnyQt.QtGui import QCursor
 from AnyQt.QtWidgets import (
@@ -20,8 +20,19 @@
     QTableWidget, QTableWidgetItem, QItemDelegate, QStyledItemDelegate,
     QTableView, QHeaderView
 )
+
 # Some Orange widgets might expect this here
-from Orange.widgets.webview import WebView as WebviewWidget  # pylint: disable=unused-import
+try:
+    from Orange.widgets.webview import WebView as WebviewWidget  # pylint: disable=unused-import
+except ImportError:
+    pass
+
+try:
+    from AnyQt.QtWebKitWidgets import QWebView
+    HAVE_WEBKIT = True
+except ImportError:
+    HAVE_WEBKIT = False
+
 import Orange.data
 from Orange.widgets.utils import getdeepattr
 from Orange.data import \

Orange/widgets/webview.py

@@ -3,9 +3,9 @@
 into Qt.
 """
 
-from PyQt4.QtCore import Qt, QSize, QUrl
-from PyQt4.QtGui import QSizePolicy, QWidget
-from PyQt4.QtWebKit import QWebView
+from AnyQt.QtCore import Qt, QSize, QUrl
+from AnyQt.QtWidgets import  QSizePolicy, QWidget
+from AnyQt.QtWebKitWidgets import QWebView
 
 
 class WebView(QWebView):