From 5bea9c779408409e523d9e64f15e3fe9ed0a5763 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 21 Jul 2017 15:16:54 +0200 Subject: [PATCH] Some more doc improvements --- CONTRIBUTING.asciidoc | 6 ++++++ README.asciidoc | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc index b7a13eaf8..fc039ad03 100644 --- a/CONTRIBUTING.asciidoc +++ b/CONTRIBUTING.asciidoc @@ -5,6 +5,12 @@ The Compiler :data-uri: :toc: +IMPORTANT: I'm currently (July 2017) more busy than usual until September, +because of exams coming up. In addition to that, a new config system is coming +which will conflict with many non-trivial contributions. Because of that, please +refrain from contributing new features until then. If you're reading this note +after mid-September, please open an issue. + I `<3` footnote:[Of course, that says `<3` in HTML.] contributors! This document contains guidelines for contributing to qutebrowser, as well as diff --git a/README.asciidoc b/README.asciidoc index dcf478aa2..a3b4918e4 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -98,11 +98,15 @@ The following software and libraries are required to run qutebrowser: * http://www.python.org/[Python] 3.4 or newer (3.6 recommended) - note that support for Python 3.4 https://github.com/qutebrowser/qutebrowser/issues/2742[will be dropped soon]. -* http://qt.io/[Qt] 5.2.0 or newer (5.9 recommended) - note that support for Qt - < 5.7.1 will be dropped soon. -* QtWebKit (old or link:https://github.com/annulen/webkit/wiki[reloaded]/NG) or - QtWebEngine. Note that support for legacy QtWebKit (before 5.212) will be - dropped soon. +* http://qt.io/[Qt] 5.2.0 or newer (5.9 recommended - note that support for Qt + < 5.7.1 will be dropped soon) with the following modules: + - QtCore / qtbase + - QtQuick (part of qtbase in some distributions) + - QtSQL (part of qtbase in some distributions) + - QtWebEngine, or + - QtWebKit (old or link:https://github.com/annulen/webkit/wiki[reloaded]/NG). + Note that support for legacy QtWebKit (before 5.212) will be + dropped soon. * http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.2.0 or newer (5.9 recommended) for Python 3. Note that support for PyQt < 5.7 will be dropped soon.