Fix importing of QtWebEngine specific code

This commit is contained in:
Florian Bruhin 2016-07-06 07:32:25 +02:00
parent 17466b4f26
commit 7444f83dbf
2 changed files with 4 additions and 6 deletions

View File

@ -22,11 +22,7 @@
from PyQt5.QtCore import pyqtSlot, Qt, QEvent
from PyQt5.QtGui import QKeyEvent
from PyQt5.QtWidgets import QApplication
try:
from PyQt5.QtWebEngineWidgets import QWebEnginePage
except ImportError:
QWebEngineView = None
from PyQt5.QtWebEngineWidgets import QWebEnginePage
from qutebrowser.browser import tab
from qutebrowser.browser.webengine import webview

View File

@ -31,7 +31,6 @@ from qutebrowser.keyinput import modeman
from qutebrowser.mainwindow import tabwidget
from qutebrowser.browser import signalfilter
from qutebrowser.browser.webkit import webview, webkittab
from qutebrowser.browser.webengine import webenginetab
from qutebrowser.utils import (log, usertypes, utils, qtutils, objreg,
urlutils, message)
@ -382,6 +381,9 @@ class TabbedBrowser(tabwidget.TabWidget):
return tabbed_browser.tabopen(url, background, explicit)
if objreg.get('args').backend == 'webengine':
# Importing this here so we don't depend on QtWebEngine without the
# argument.
from qutebrowser.browser.webengine import webenginetab
tab_class = webenginetab.WebEngineViewTab
else:
tab_class = webkittab.WebViewTab