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

Documentation update for Qt 5.3.1

Browse Source
This commit is contained in:
Florian Bruhin 2014-07-04 14:37:31 +02:00
parent 117755863d
commit f173583605
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.asciidoc
View File

@ -28,10 +28,10 @@ Requirements
The following software and libraries are required to run qutebrowser: The following software and libraries are required to run qutebrowser:
* http://www.python.org/[Python] 3.3 or newer (3.4 recommended) * http://www.python.org/[Python] 3.3 or newer (3.4 recommended)
* http://qt-project.org/[Qt] 5.2 or newer (5.3 recommended) * http://qt-project.org/[Qt] 5.2 or newer (5.3.1 recommended)
* QtWebKit * QtWebKit
* http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.2 or newer (5.3 * http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.2 or newer
recommended) for Python 3 (5.3.1 recommended) for Python 3
* https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools] * https://pypi.python.org/pypi/setuptools/[pkg_resources/setuptools]
The following libraries are optional and provide better debugging: The following libraries are optional and provide better debugging:

6
qutebrowser/browser/webpage.py
View File

@ -66,10 +66,8 @@ class BrowserPage(QWebPage):
self._view = view self._view = view
if PYQT_VERSION > 0x050300: if PYQT_VERSION > 0x050300:
# This breaks in <= 5.3.0, but in anything later it hopefully # This is broken in Qt <= 5.3.0.
# works. # See http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034385.html
# FIXME confirm this as soon as 5.3.1 is out!
# pylint: disable=invalid-name
self.javaScriptPrompt = self._javascript_prompt self.javaScriptPrompt = self._javascript_prompt
def _javascript_prompt(self, _frame, msg, default): def _javascript_prompt(self, _frame, msg, default):

2
qutebrowser/network/networkmanager.py
View File

@ -148,8 +148,6 @@ class NetworkManager(QNetworkAccessManager):
# currency on http://ch.mouser.com/localsites/ # currency on http://ch.mouser.com/localsites/
# #
# See http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034420.html # See http://www.riverbankcomputing.com/pipermail/pyqt/2014-June/034420.html
#
# FIXME: Check if this is really fixed in 5.3.1.
with log.disable_qt_msghandler(): with log.disable_qt_msghandler():
reply = super().createRequest(op, req, outgoing_data) reply = super().createRequest(op, req, outgoing_data)
else: else:

4
qutebrowser/utils/earlyinit.py
View File

@ -127,8 +127,8 @@ def fix_harfbuzz(args):
https://bugreports.qt-project.org/browse/QTBUG-39278 https://bugreports.qt-project.org/browse/QTBUG-39278
So the new engine will be more stable. So the new engine will be more stable.
- On Qt 5.3.1 this bug hopefully will be fixed and the old engine - On Qt 5.3.1 this bug is fixed and the old engine will be the more stable
will be the more stable one again. one again.
IMPORTANT: This needs to be done before QWidgets is imported in any way! IMPORTANT: This needs to be done before QWidgets is imported in any way!