From f17131f6c2bb22d23bb345faa50cf59e80b3c706 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 12 Jun 2015 16:59:33 +0200 Subject: [PATCH] Change Qt links to point to qt.io. --- CONTRIBUTING.asciidoc | 11 ++++----- FAQ.asciidoc | 25 ++++++++++---------- README.asciidoc | 4 ++-- doc/help/settings.asciidoc | 2 +- qutebrowser/browser/cookies.py | 2 +- qutebrowser/browser/downloads.py | 2 +- qutebrowser/completion/completiondelegate.py | 1 - qutebrowser/config/configdata.py | 2 +- qutebrowser/mainwindow/statusbar/textbase.py | 2 +- qutebrowser/misc/earlyinit.py | 4 ++-- qutebrowser/utils/log.py | 8 +++---- qutebrowser/utils/standarddir.py | 4 ++-- qutebrowser/utils/urlutils.py | 2 +- qutebrowser/utils/utils.py | 2 +- scripts/segfault_test.py | 10 ++++---- 15 files changed, 39 insertions(+), 42 deletions(-) diff --git a/CONTRIBUTING.asciidoc b/CONTRIBUTING.asciidoc index 8123514a9..558887a5b 100644 --- a/CONTRIBUTING.asciidoc +++ b/CONTRIBUTING.asciidoc @@ -153,7 +153,7 @@ Useful websites Some resources which might be handy: -* http://qt-project.org/doc/qt-5/classes.html[The Qt5 reference] +* http://doc.qt.io/qt-5/classes.html[The Qt5 reference] * https://docs.python.org/3/library/index.html[The Python reference] * http://httpbin.org/[httpbin, a test service for HTTP requests/responses] * http://requestb.in/[RequestBin, a service to inspect HTTP requests] @@ -211,8 +211,7 @@ Other Languages] (http://www.rfc-editor.org/errata_search.php?rfc=5646[Errata]) * http://www.w3.org/TR/CSS2/[Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification] -* http://qt-project.org/doc/qt-4.8/stylesheet-reference.html[Qt Style Sheets -Reference] +* http://doc.qt.io/qt-5/stylesheet-reference.html[Qt Style Sheets Reference] * http://mimesniff.spec.whatwg.org/[MIME Sniffing Standard] * http://spec.whatwg.org/[WHATWG specifications] * http://www.w3.org/html/wg/drafts/html/master/Overview.html[HTML 5.1 Nightly] @@ -293,8 +292,8 @@ All objects can be printed by starting with the `--debug` flag and using the The registry is mainly used for <> but also can be useful in places where using Qt's -http://qt-project.org/doc/qt-5/signalsandslots.html[signals and slots] -mechanism would be difficult. +http://doc.qt.io/qt-5/signalsandslots.html[signals and slots] mechanism would +be difficult. Logging ~~~~~~~ @@ -539,7 +538,7 @@ New Qt release * Run all tests and check nothing is broken. * Check the -https://bugreports.qt-project.org/issues/?jql=reporter%20%3D%20%22The%20Compiler%22%20ORDER%20BY%20fixVersion%20ASC[Qt bugtracker] +https://bugreports.qt.io/issues/?jql=reporter%20%3D%20%22The%20Compiler%22%20ORDER%20BY%20fixVersion%20ASC[Qt bugtracker] and make sure all bugs marked as resolved are actually fixed. * Update own PKGBUILDs based on upstream Archlinux updates and rebuild. * Update recommended Qt version in `README` diff --git a/FAQ.asciidoc b/FAQ.asciidoc index 16d02cfa0..886721a18 100644 --- a/FAQ.asciidoc +++ b/FAQ.asciidoc @@ -4,8 +4,8 @@ The Compiler [qanda] What is qutebrowser based on?:: - qutebrowser uses http://www.python.org/[Python], http://qt-project.org/[Qt] - and http://www.riverbankcomputing.com/software/pyqt/intro[PyQt]. + qutebrowser uses http://www.python.org/[Python], http://qt.io/[Qt] and + http://www.riverbankcomputing.com/software/pyqt/intro[PyQt]. + The concept of it is largely inspired by http://portix.bitbucket.org/dwb/[dwb] and http://www.vimperator.org/vimperator[Vimperator]. Many actions and @@ -15,7 +15,7 @@ Why another browser?:: It might be hard to believe, but I didn't find any browser which I was happy with, so I started to write my own. Also, I needed a project to get into writing GUI applications with Python and - link:http://qt-project.org/[Qt]/link:http://www.riverbankcomputing.com/software/pyqt/intro[PyQt]. + link:http://qt.io/[Qt]/link:http://www.riverbankcomputing.com/software/pyqt/intro[PyQt]. + Read the next few questions to find out why I was unhappy with existing software. @@ -32,12 +32,11 @@ API] seems to lack basic features like proxy support, and almost no projects seem to have started porting to WebKit2 (I only know of http://www.uzbl.org/[uzbl]). + -qutebrowser uses http://qt-project.org/[Qt] and -http://qt-project.org/wiki/QtWebKit[QtWebKit] instead, which suffers from far -less such crashes. It might switch to -http://qt-project.org/wiki/QtWebEngine[QtWebEngine] in the future, which is -based on Google's https://en.wikipedia.org/wiki/Blink_(layout_engine)[Blink] -rendering engine. +qutebrowser uses http://qt.io/[Qt] and http://wiki.qt.io/QtWebKit[QtWebKit] +instead, which suffers from far less such crashes. It might switch to +http://wiki.qt.io/QtWebEngine[QtWebEngine] in the future, which is based on +Google's https://en.wikipedia.org/wiki/Blink_(layout_engine)[Blink] rendering +engine. What's wrong with https://www.mozilla.org/en-US/firefox/new/[Firefox] and link:http://5digits.org/pentadactyl/[Pentadactyl]/link:http://www.vimperator.org/vimperator[Vimperator]?:: Firefox likes to break compatibility with addons on each upgrade, gets @@ -54,10 +53,10 @@ What's wrong with http://www.chromium.org/Home[Chromium] and https://vimium.gith Why Python?:: I enjoy writing Python since 2011, which made it one of the possible - choices. I wanted to use http://qt-project.org/[Qt] because of - http://qt-project.org/wiki/QtWebKit[QtWebKit] so I didn't have - http://qt-project.org/wiki/Category:LanguageBindings[many other choices]. I - don't like C++ and can't write it very well, so that wasn't an alternative. + choices. I wanted to use http://qt.io/[Qt] because of + http://wiki.qt.io/QtWebKit[QtWebKit] so I didn't have + http://wiki.qt.io/Category:LanguageBindings[many other choices]. I don't + like C++ and can't write it very well, so that wasn't an alternative. But isn't Python too slow for a browser?:: http://www.infoworld.com/d/application-development/van-rossum-python-not-too-slow-188715[No.] diff --git a/README.asciidoc b/README.asciidoc index 065e57e57..03aefa777 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -89,7 +89,7 @@ Requirements The following software and libraries are required to run qutebrowser: * http://www.python.org/[Python] 3.4 -* http://qt-project.org/[Qt] 5.2.0 or newer (5.4.2 recommended) +* http://qt.io/[Qt] 5.2.0 or newer (5.4.2 recommended) * QtWebKit * http://www.riverbankcomputing.com/software/pyqt/intro[PyQt] 5.2.0 or newer (5.4.2 recommended) for Python 3 @@ -222,7 +222,7 @@ Also, thanks to: * Everyone who had the patience to test qutebrowser before v0.1. * Everyone triaging/fixing my bugs in the -https://bugreports.qt-project.org/secure/Dashboard.jspa[Qt bugtracker] +https://bugreports.qt.io/secure/Dashboard.jspa[Qt bugtracker] * Everyone answering my questions on http://stackoverflow.com/[Stack Overflow] and in IRC. * All the projects which were a great help while developing qutebrowser. diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index 837f84a3e..2d0f9364c 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -1474,7 +1474,7 @@ A value can be in one of the following format: * transparent (no color) * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or percentages) * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359) - * A gradient as explained in http://qt-project.org/doc/qt-4.8/stylesheet-reference.html#list-of-property-types[the Qt documentation] under ``Gradient''. + * A gradient as explained in http://doc.qt.io/qt-5/stylesheet-reference.html#list-of-property-types[the Qt documentation] under ``Gradient''. A *.system value determines the color system to use for color interpolation between similarly-named *.start and *.stop entries, regardless of how they are defined in the options. Valid values are 'rgb', 'hsv', and 'hsl'. diff --git a/qutebrowser/browser/cookies.py b/qutebrowser/browser/cookies.py index f6af98d57..0c6b8c036 100644 --- a/qutebrowser/browser/cookies.py +++ b/qutebrowser/browser/cookies.py @@ -84,7 +84,7 @@ class CookieJar(RAMCookieJar): def purge_old_cookies(self): """Purge expired cookies from the cookie jar.""" # Based on: - # http://qt-project.org/doc/qt-5/qtwebkitexamples-webkitwidgets-browser-cookiejar-cpp.html + # http://doc.qt.io/qt-5/qtwebkitexamples-webkitwidgets-browser-cookiejar-cpp.html now = QDateTime.currentDateTime() cookies = [c for c in self.allCookies() if c.isSessionCookie() or c.expirationDate() >= now] diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index cfcf23eec..3f8bf116c 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -685,7 +685,7 @@ class DownloadManager(QAbstractListModel): if fileobj is not None and filename is not None: raise TypeError("Only one of fileobj/filename may be given!") # WORKAROUND for Qt corrupting data loaded from cache: - # https://bugreports.qt-project.org/browse/QTBUG-42757 + # https://bugreports.qt.io/browse/QTBUG-42757 request.setAttribute(QNetworkRequest.CacheLoadControlAttribute, QNetworkRequest.AlwaysNetwork) suggested_fn = urlutils.filename_from_url(request.url()) diff --git a/qutebrowser/completion/completiondelegate.py b/qutebrowser/completion/completiondelegate.py index 03caa5158..3fe7e00ba 100644 --- a/qutebrowser/completion/completiondelegate.py +++ b/qutebrowser/completion/completiondelegate.py @@ -145,7 +145,6 @@ class CompletionItemDelegate(QStyledItemDelegate): rect: The QRect to clip the drawing to. """ # We can't use drawContents because then the color would be ignored. - # See: https://qt-project.org/forums/viewthread/21492 clip = QRectF(0, 0, rect.width(), rect.height()) self._painter.save() if self._opt.state & QStyle.State_Selected: diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index eb1b529c7..a19a4fcdb 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -100,7 +100,7 @@ SECTION_DESC = { " * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or " "percentages)\n" " * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359)\n" - " * A gradient as explained in http://qt-project.org/doc/qt-4.8/" + " * A gradient as explained in http://doc.qt.io/qt-5/" "stylesheet-reference.html#list-of-property-types[the Qt " "documentation] under ``Gradient''.\n\n" "A *.system value determines the color system to use for color " diff --git a/qutebrowser/mainwindow/statusbar/textbase.py b/qutebrowser/mainwindow/statusbar/textbase.py index 1006effe7..5a5954f85 100644 --- a/qutebrowser/mainwindow/statusbar/textbase.py +++ b/qutebrowser/mainwindow/statusbar/textbase.py @@ -70,7 +70,7 @@ class TextBase(QLabel): More info: http://stackoverflow.com/q/21890462/2085149 - https://bugreports.qt-project.org/browse/QTBUG-36945 + https://bugreports.qt.io/browse/QTBUG-36945 https://codereview.qt-project.org/#/c/79181/ Args: diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 43806df58..ca8096b03 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -137,10 +137,10 @@ def fix_harfbuzz(args): - On Qt 5.2 (and probably earlier) the new engine probably has more crashes and is also experimental. - e.g. https://bugreports.qt-project.org/browse/QTBUG-36099 + e.g. https://bugreports.qt.io/browse/QTBUG-36099 - On Qt 5.3.0 there's a bug that affects a lot of websites: - https://bugreports.qt-project.org/browse/QTBUG-39278 + https://bugreports.qt.io/browse/QTBUG-39278 So the new engine will be more stable. - On Qt 5.3.1 this bug is fixed and the old engine will be the more stable diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index 269e1e38d..9106eb7dd 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -259,23 +259,23 @@ def qt_message_handler(msg_type, context, msg): # suppressed_msgs is a list of regexes matching the message texts to hide. suppressed_msgs = ( # PNGs in Qt with broken color profile - # https://bugreports.qt-project.org/browse/QTBUG-39788 + # https://bugreports.qt.io/browse/QTBUG-39788 "libpng warning: iCCP: Not recognizing known sRGB profile that has " "been edited", # Hopefully harmless warning "OpenType support missing for script ", # Error if a QNetworkReply gets two different errors set. Harmless Qt # bug on some pages. - # https://bugreports.qt-project.org/browse/QTBUG-30298 + # https://bugreports.qt.io/browse/QTBUG-30298 "QNetworkReplyImplPrivate::error: Internal problem, this method must " "only be called once.", # Sometimes indicates missing text, but most of the time harmless "load glyph failed ", - # Harmless, see https://bugreports.qt-project.org/browse/QTBUG-42479 + # Harmless, see https://bugreports.qt.io/browse/QTBUG-42479 "content-type missing in HTTP POST, defaulting to " "application/x-www-form-urlencoded. Use QNetworkRequest::setHeader() " "to fix this problem.", - # https://bugreports.qt-project.org/browse/QTBUG-43118 + # https://bugreports.qt.io/browse/QTBUG-43118 "Using blocking call!", # Hopefully harmless '"Method "GetAll" with signature "s" on interface ' diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py index 6d6e5a6dd..bbe61c459 100644 --- a/qutebrowser/utils/standarddir.py +++ b/qutebrowser/utils/standarddir.py @@ -118,7 +118,7 @@ def _get(typ): Args: typ: A member of the QStandardPaths::StandardLocation enum, - see http://qt-project.org/doc/qt-5/qstandardpaths.html#StandardLocation-enum + see http://doc.qt.io/qt-5/qstandardpaths.html#StandardLocation-enum """ overridden, path = _from_args(typ, _args) if not overridden: @@ -127,7 +127,7 @@ def _get(typ): if (typ == QStandardPaths.ConfigLocation and path.split(os.sep)[-1] != appname): # WORKAROUND - see - # https://bugreports.qt-project.org/browse/QTBUG-38872 + # https://bugreports.qt.io/browse/QTBUG-38872 path = os.path.join(path, appname) if typ == QStandardPaths.DataLocation and os.name == 'nt': # Under windows, config/data might end up in the same directory. diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 143e7cfc5..5d1c40465 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -279,7 +279,7 @@ def qurl_from_user_input(urlstr): IPv6, so we first try to handle it as a valid IPv6, and if that fails we use QUrl.fromUserInput. - WORKAROUND - https://bugreports.qt-project.org/browse/QTBUG-41089 + WORKAROUND - https://bugreports.qt.io/browse/QTBUG-41089 FIXME - Maybe https://codereview.qt-project.org/#/c/93851/ has a better way to solve this? https://github.com/The-Compiler/qutebrowser/issues/109 diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index 9af412d1c..b25997662 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -240,7 +240,7 @@ def key_to_string(key): """ special_names_str = { # Some keys handled in a weird way by QKeySequence::toString. - # See https://bugreports.qt-project.org/browse/QTBUG-40030 + # See https://bugreports.qt.io/browse/QTBUG-40030 # Most are unlikely to be ever needed, but you never know ;) # For dead/combining keys, we return the corresponding non-combining # key, as that's easier to add to the config. diff --git a/scripts/segfault_test.py b/scripts/segfault_test.py index e2a374343..091b1b7e4 100755 --- a/scripts/segfault_test.py +++ b/scripts/segfault_test.py @@ -70,20 +70,20 @@ def main(): if len(sys.argv) < 2: # pages which previously caused problems pages = [ - # ANGLE, https://bugreports.qt-project.org/browse/QTBUG-39723 + # ANGLE, https://bugreports.qt.io/browse/QTBUG-39723 ('http://www.binpress.com/', False), ('http://david.li/flow/', False), ('https://imzdl.com/', False), # not reproducible - # https://bugreports.qt-project.org/browse/QTBUG-39847 + # https://bugreports.qt.io/browse/QTBUG-39847 ('http://www.20min.ch/', True), - # HarfBuzz, https://bugreports.qt-project.org/browse/QTBUG-39278 + # HarfBuzz, https://bugreports.qt.io/browse/QTBUG-39278 ('http://www.the-compiler.org/', True), ('http://phoronix.com', True), ('http://twitter.com', True), - # HarfBuzz #2, https://bugreports.qt-project.org/browse/QTBUG-36099 + # HarfBuzz #2, https://bugreports.qt.io/browse/QTBUG-36099 ('http://lenta.ru/', True), - # Unknown, https://bugreports.qt-project.org/browse/QTBUG-41360 + # Unknown, https://bugreports.qt.io/browse/QTBUG-41360 ('http://salt.readthedocs.org/en/latest/topics/pillar/', True), ] else: