From b966691277d224700e54d3bd489dc76adbe2243a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 14 Aug 2017 17:59:04 -0400 Subject: [pkg] fallback to pyqt-webkit if webengine not found --- src/leap/bitmask/gui/app.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/leap/bitmask/gui/app.py b/src/leap/bitmask/gui/app.py index afa914c7..3d380bc3 100644 --- a/src/leap/bitmask/gui/app.py +++ b/src/leap/bitmask/gui/app.py @@ -38,21 +38,21 @@ from leap.common.config import get_path_prefix if platform.system() == 'Windows': from multiprocessing import freeze_support from PySide import QtCore, QtGui - #from PySide import QtWebKit from PySide.QtGui import QDialog from PySide.QtGui import QApplication from PySide.QtWebKit import QWebView, QGraphicsWebView from PySide.QtCore import QSize else: from PyQt5 import QtCore, QtGui - #from PyQt5 import QtWebEngine from PyQt5.QtCore import QSize from PyQt5.QtCore import QObject, pyqtSlot from PyQt5.QtWidgets import QApplication - #from PyQt5.QtWebKitWidgets import QWebView - #from PyQt5.QtWebKit import QWebSettings - from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView - from PyQt5.QtWebEngineWidgets import QWebEngineSettings as QWebSettings + try: + from PyQt5.QtWebKitWidgets import QWebView + from PyQt5.QtWebKit import QWebSettings + except ImportError: + from PyQt5.QtWebEngineWidgets import QWebEngineView as QWebView + from PyQt5.QtWebEngineWidgets import QWebEngineSettings as QWebSettings IS_WIN = platform.system() == "Windows" -- cgit v1.2.3