Don't depend on PyQt5.QtQuickWidgets to get RWHV
Some distributions (at least FreeBSD) don't package that module, so let's not rely on it.
This commit is contained in:
parent
c87757a913
commit
62d8b5b574
@ -55,6 +55,9 @@ Added
|
|||||||
Changed
|
Changed
|
||||||
~~~~~~~
|
~~~~~~~
|
||||||
|
|
||||||
|
- In v1.3.2 a dependency on the `PyQt5.QtQuickWidgets` module was accidentally
|
||||||
|
introduced. Since that module isn't packaged everywhere, it's been removed
|
||||||
|
again.
|
||||||
- The Windows/macOS releases now bundle Qt 5.11.1 which is based on
|
- The Windows/macOS releases now bundle Qt 5.11.1 which is based on
|
||||||
Chromium 65.0.3325.151 with security fixes up to Chromium 67.0.3396.87.
|
Chromium 65.0.3325.151 with security fixes up to Chromium 67.0.3396.87.
|
||||||
- New short flags for commandline arguments: `-B` and `-T` for `--basedir` and
|
- New short flags for commandline arguments: `-B` and `-T` for `--basedir` and
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
import sip
|
import sip
|
||||||
from PyQt5.QtCore import pyqtSignal, pyqtSlot, QUrl, PYQT_VERSION
|
from PyQt5.QtCore import pyqtSignal, pyqtSlot, QUrl, PYQT_VERSION
|
||||||
from PyQt5.QtGui import QPalette
|
from PyQt5.QtGui import QPalette
|
||||||
from PyQt5.QtQuickWidgets import QQuickWidget
|
from PyQt5.QtWidgets import QWidget
|
||||||
from PyQt5.QtWebEngineWidgets import (QWebEngineView, QWebEnginePage,
|
from PyQt5.QtWebEngineWidgets import (QWebEngineView, QWebEnginePage,
|
||||||
QWebEngineScript)
|
QWebEngineScript)
|
||||||
|
|
||||||
@ -71,10 +71,10 @@ class WebEngineView(QWebEngineView):
|
|||||||
if proxy is not None:
|
if proxy is not None:
|
||||||
return proxy
|
return proxy
|
||||||
|
|
||||||
# This should only find the RenderWidgetHostViewQtDelegateWidget,
|
# We don't want e.g. a QMenu.
|
||||||
# but not e.g. a QMenu
|
rwhv_class = 'QtWebEngineCore::RenderWidgetHostViewQtDelegateWidget'
|
||||||
children = [c for c in self.findChildren(QQuickWidget)
|
children = [c for c in self.findChildren(QWidget)
|
||||||
if c.isVisible()]
|
if c.isVisible() and c.inherits(rwhv_class)]
|
||||||
|
|
||||||
log.webview.debug("Found possibly lost focusProxy: {}"
|
log.webview.debug("Found possibly lost focusProxy: {}"
|
||||||
.format(children))
|
.format(children))
|
||||||
|
@ -361,9 +361,6 @@ class QuteProc(testprocess.Process):
|
|||||||
"Focus object changed: "
|
"Focus object changed: "
|
||||||
"<qutebrowser.browser.webengine.webview.WebEngineView object "
|
"<qutebrowser.browser.webengine.webview.WebEngineView object "
|
||||||
"at *>",
|
"at *>",
|
||||||
# Qt >= 5.11 with workarounds
|
|
||||||
"Focus object changed: "
|
|
||||||
"<PyQt5.QtQuickWidgets.QQuickWidget object at *>",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
if (log_line.category == 'ipc' and
|
if (log_line.category == 'ipc' and
|
||||||
|
Loading…
Reference in New Issue
Block a user