diff options
author | Florian Bruhin <me@the-compiler.org> | 2019-09-26 18:33:48 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2019-09-26 18:33:48 +0200 |
commit | c397e9326b6d323f41e1f26157e113d792c5895b (patch) | |
tree | 3f963ec3dabd495c1819ac0b47542ac37c4e7722 /tox.ini | |
parent | 4f76266a4b961e8db7df8dfea084678a2e9dd39e (diff) | |
download | qutebrowser-c397e9326b6d323f41e1f26157e113d792c5895b.tar.gz qutebrowser-c397e9326b6d323f41e1f26157e113d792c5895b.zip |
Go back to Qt 5.12 for tox/pyinstaller
This reverts commit 548b5a17d72b42df997055c945c5e42e80b31af3.
This reverts commit fe32e00a4e1b5a7cfd49638501a072df243636c2.
Due to QTBUG-77364 (broken keyboard focus), we can't upgrade to qtbase 5.13.1.
However, with 5.13.0 (and QtWebEngine 5.13.1), we run into two more issues:
- Segfaults in QQuickWindowPrivate::updateDirtyNode() when logging into a
Google account (especially on macOS).
- Qt 5.13.0 with the old PyQt5 exit scheme segfaults on exit on Windows.
However, pyqt5_enable_new_onexit_scheme() was added in PyQt 5.13.1.
See https://bugreports.qt.io/browse/QTBUG-77364
See https://www.riverbankcomputing.com/news/pyqt-5131
Reopens #4918
Diffstat (limited to 'tox.ini')
-rw-r--r-- | tox.ini | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -63,7 +63,7 @@ commands = {envpython} -c "" usedevelop = true deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/misc/requirements/requirements-pyqt.txt + -r{toxinidir}/misc/requirements/requirements-pyqt-5.12.txt [testenv:misc] ignore_errors = true @@ -178,7 +178,7 @@ passenv = APPDATA HOME deps = -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-pyinstaller.txt - -r{toxinidir}/misc/requirements/requirements-pyqt.txt + -r{toxinidir}/misc/requirements/requirements-pyqt-5.12.txt commands = {envbindir}/pyinstaller --noconfirm misc/qutebrowser.spec |