rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'edrex-patch-1'

Browse Source
This commit is contained in:
Florian Bruhin 2016-10-24 22:24:37 +02:00
commit 7ebe4d8bfc
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
INSTALL.asciidoc
View File

@ -272,18 +272,12 @@ qutebrowser from source.
==== Homebrew ==== Homebrew
For Homebrew, a few extra steps are necessary since Homebrew dropped QtWebKit Homebrew's builds of Qt and PyQt no longer include QtWebKit, so it is necessary
from Qt 5.6 - however, some users reported this didn't work for them, so using to build from source. The build takes several hours on an average laptop.
the `.app` is strongly encouraged.
This installs a Qt 5.5 and symlinks it so PyQt5 will work with it instead of Qt
5.6. This requires that `qt5` is not installed via Homebrew:
---- ----
$ brew install python3 d-bus mysql sip xz $ brew install qt5 --with-qtwebkit
$ brew install homebrew/versions/qt55 $ brew install -s pyqt5
$ brew install --ignore-dependencies pyqt5
$ ln -s /usr/local/opt/qt55 /usr/local/opt/qt5
$ pip3.5 install qutebrowser $ pip3.5 install qutebrowser
---- ----

2
README.asciidoc
View File

@ -231,6 +231,7 @@ Contributors, sorted by the number of commits in descending order:
* Jean-Louis Fuchs * Jean-Louis Fuchs
* Fritz V155 Reichwald * Fritz V155 Reichwald
* Franz Fellner * Franz Fellner
* Eric Drechsel
* zwarag * zwarag
* xd1le * xd1le
* rsteube * rsteube
@ -263,7 +264,6 @@ Contributors, sorted by the number of commits in descending order:
* Helen Sherwood-Taylor * Helen Sherwood-Taylor
* HalosGhost * HalosGhost
* Gregor Pohl * Gregor Pohl
* Eric Drechsel
* Eivind Uggedal * Eivind Uggedal
* Dietrich Daroch * Dietrich Daroch
* Derek Sivers * Derek Sivers