Update for PyQt 5.11

8 files changed, 12 insertions, 26 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index f2424fc94..d336f20cc 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -7,7 +7,7 @@ environment:
     PYTHONUNBUFFERED: 1
     PYTHON: C:\Python36\python.exe
     matrix:
-    - TESTENV: py36-pyqt510
+    - TESTENV: py36-pyqt511
     - TESTENV: pylint
 
 install:
diff --git a/.travis.yml b/.travis.yml
index 143938aef..c8732fe29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,16 +20,9 @@ matrix:
     - os: linux
       env: TESTENV=py36-pyqt59
     - os: linux
-      env: TESTENV=py36-pyqt510-cov
-      # We need a newer Xvfb as a WORKAROUND for:
-      # https://bugreports.qt.io/browse/QTBUG-64928
-      sudo: required
-      addons:
-         apt:
-           sources:
-           - sourceline: "deb http://us.archive.ubuntu.com/ubuntu/ xenial main universe"
-           packages:
-           - xvfb
+      env: TESTENV=py36-pyqt510
+    - os: linux
+      env: TESTENV=py36-pyqt511-cov
     - os: osx
       env: TESTENV=py36 OSX=sierra
       osx_image: xcode9.2
diff --git a/README.asciidoc b/README.asciidoc
index db401d49d..2237955dd 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -97,7 +97,7 @@ Requirements
 The following software and libraries are required to run qutebrowser:
 
 * http://www.python.org/[Python] 3.5 or newer (3.6 recommended)
-* http://qt.io/[Qt] 5.7.1 or newer (5.10 recommended) with the following modules:
+* http://qt.io/[Qt] 5.7.1 or newer (5.11.1 recommended) with the following modules:
   - QtCore / qtbase
   - QtQuick (part of qtbase in some distributions)
   - QtSQL (part of qtbase in some distributions)
@@ -107,7 +107,7 @@ The following software and libraries are required to run qutebrowser:
     link:https://github.com/annulen/webkit/wiki[updated fork] (5.212) is
     supported
 * http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.7.0 or newer
-  (5.10 recommended) for Python 3
+  (5.11.2 recommended) for Python 3
 * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
 * http://fdik.org/pyPEG/[pyPEG2]
 * http://jinja.pocoo.org/[jinja2]
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index 07c2dfe25..b130825ec 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -689,8 +689,6 @@ New PyQt release
 ~~~~~~~~~~~~~~~~
 
 * See above.
-* Install new PyQt in Windows VM (32- and 64-bit).
-* Download new installer and update PyQt installer path in `ci_install.py`.
 * Update `tox.ini`/`.travis.yml`/`.appveyor.yml` to test new versions.
 
 qutebrowser release
diff --git a/misc/requirements/requirements-pyqt-old.txt b/misc/requirements/requirements-pyqt-old.txt
deleted file mode 100644
index f0fa50ad5..000000000
--- a/misc/requirements/requirements-pyqt-old.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# This file is automatically generated by scripts/dev/recompile_requirements.py
-
-PyQt5==5.10  # rq.filter: != 5.10.1
-sip==4.19.8
diff --git a/misc/requirements/requirements-pyqt-old.txt-raw b/misc/requirements/requirements-pyqt-old.txt-raw
deleted file mode 100644
index 16b82e0d5..000000000
--- a/misc/requirements/requirements-pyqt-old.txt-raw
+++ /dev/null
@@ -1,2 +0,0 @@
-PyQt5==5.10.0
-#@ filter: PyQt5 != 5.10.1
\ No newline at end of file
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 059ff2df7..063f85122 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,4 +1,4 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.10.1
-sip==4.19.8
+PyQt5==5.11.2
+PyQt5-sip==4.19.11
diff --git a/tox.ini b/tox.ini
index 4e155df57..ab7be4d83 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,8 +13,8 @@ skipsdist = true
 setenv =
     QT_QPA_PLATFORM_PLUGIN_PATH={envdir}/Lib/site-packages/PyQt5/plugins/platforms
     PYTEST_QT_API=pyqt5
-    pyqt{,56,571,59,510}: LINK_PYQT_SKIP=true
-    pyqt{,56,571,59,510}: QUTE_BDD_WEBENGINE=true
+    pyqt{,56,571,59,510,511}: LINK_PYQT_SKIP=true
+    pyqt{,56,571,59,510,511}: QUTE_BDD_WEBENGINE=true
     cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report=
 passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER
 basepython =
@@ -28,6 +28,7 @@ deps =
     pyqt571: PyQt5==5.7.1
     pyqt59: PyQt5==5.9.2
     pyqt510: PyQt5==5.10.1
+    pyqt511: PyQt5==5.11.2
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -bb -m pytest {posargs:tests}
@@ -59,7 +60,7 @@ commands = {envpython} -c ""
 usedevelop = true
 deps =
     -r{toxinidir}/requirements.txt
-    -r{toxinidir}/misc/requirements/requirements-pyqt-old.txt
+    -r{toxinidir}/misc/requirements/requirements-pyqt.txt
 
 [testenv:misc]
 ignore_errors = true