From c964bfb4bfabc4dea92daf59d7d834927b2549c3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Mon, 25 Feb 2019 10:36:08 +0100
Subject: Finish Qt 5.12 work

Closes #4591
---
 .appveyor.yml   |  6 +++---
 .travis.yml     | 15 ++++++---------
 README.asciidoc |  4 ++--
 tox.ini         |  2 +-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 92a20c0bd..42baac6c9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -5,15 +5,15 @@ cache:
 build: off
 environment:
     PYTHONUNBUFFERED: 1
-    PYTHON: C:\Python36-x64\python.exe
+    PYTHON: C:\Python37-x64\python.exe
     matrix:
-    - TESTENV: py36-pyqt511
+    - TESTENV: py37-pyqt512
     - TESTENV: pylint
 
 install:
   - '%PYTHON% -m pip install -U pip'
   - '%PYTHON% -m pip install -r misc\requirements\requirements-tox.txt'
-  - 'set PATH=C:\Python36-x64;%PATH'
+  - 'set PATH=C:\Python37-x64;%PATH'
 
 test_script:
   - '%PYTHON% -m tox -e %TESTENV%'
diff --git a/.travis.yml b/.travis.yml
index 061810ee8..7545784ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,14 +31,11 @@ matrix:
           packages:
           - xfonts-base
 
-    ### PyQt 5.11 (with coverage)
-    - env: TESTENV=py36-pyqt511-cov
-    ### PyQt 5.11 (Python 3.7)
-    - python: 3.7
-      env: TESTENV=py37-pyqt511
-
-    ### PyQt 5.12
-    - env: TESTENV=py36-pyqt512
+    ### PyQt 5.11
+    - env: TESTENV=py36-pyqt511
+
+    ### PyQt 5.12 (Python 3.7, with coverage)
+    - env: TESTENV=py37-pyqt512-cov
       addons:
         apt:
           packages:
@@ -46,7 +43,7 @@ matrix:
 
     ### macOS sierra
     - os: osx
-      env: TESTENV=py37-pyqt511 OSX=sierra
+      env: TESTENV=py37-pyqt512 OSX=sierra
       osx_image: xcode9.2
       language: generic
     ### macOS yosemite
diff --git a/README.asciidoc b/README.asciidoc
index b2d882eae..334c0561e 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -97,7 +97,7 @@ Requirements
 The following software and libraries are required to run qutebrowser:
 
 * https://www.python.org/[Python] 3.5 or newer (3.6 recommended)
-* https://www.qt.io/[Qt] 5.7.1 or newer (5.11 recommended, support for < 5.9
+* https://www.qt.io/[Qt] 5.7.1 or newer (5.12 recommended, support for < 5.9
   will be dropped soon) with the following modules:
   - QtCore / qtbase
   - QtQuick (part of qtbase in some distributions)
@@ -108,7 +108,7 @@ The following software and libraries are required to run qutebrowser:
     only the link:https://github.com/annulen/webkit/wiki[updated fork] (5.212)
     is supported
 * https://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.7.0 or newer
-  (5.11 recommended, support for < 5.9 will be dropped soon) for Python 3
+  (5.12 recommended, support for < 5.9 will be dropped soon) for Python 3
 * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
 * https://fdik.org/pyPEG/[pyPEG2]
 * http://jinja.pocoo.org/[jinja2]
diff --git a/tox.ini b/tox.ini
index 1dfc5ac5a..52665dcf9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py36-pyqt511-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint
+envlist = py37-pyqt512-cov,misc,vulture,flake8,pylint,pyroma,check-manifest,eslint
 distshare = {toxworkdir}
 skipsdist = true
 
-- 
cgit v1.2.3-54-g00ecf