summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-11-24 10:32:51 +0100
committerFlorian Bruhin <me@the-compiler.org>2022-11-24 14:12:38 +0100
commit9ad13fa50895a206663893fe3478c4b3eae78baa (patch)
tree1cf3d0a71784ca89e780ff90f142a8bdbf3e71e6
parent714bf5f261c625cf3169f3398e8310e0d08265d5 (diff)
downloadqutebrowser-9ad13fa50895a206663893fe3478c4b3eae78baa.tar.gz
qutebrowser-9ad13fa50895a206663893fe3478c4b3eae78baa.zip
Update Qt doc links to Qt 6
-rw-r--r--doc/contributing.asciidoc20
-rw-r--r--doc/help/commands.asciidoc8
-rw-r--r--doc/help/settings.asciidoc4
-rw-r--r--doc/qutebrowser.1.asciidoc2
-rw-r--r--qutebrowser/browser/network/proxy.py2
-rw-r--r--qutebrowser/browser/webengine/webenginetab.py2
-rw-r--r--qutebrowser/components/misccommands.py8
-rw-r--r--qutebrowser/config/configdata.yml2
-rw-r--r--qutebrowser/config/configtypes.py2
-rw-r--r--qutebrowser/qutebrowser.py2
10 files changed, 28 insertions, 24 deletions
diff --git a/doc/contributing.asciidoc b/doc/contributing.asciidoc
index e6bed08d2..d99dc41ef 100644
--- a/doc/contributing.asciidoc
+++ b/doc/contributing.asciidoc
@@ -231,7 +231,8 @@ Useful websites
Some resources which might be handy:
-* https://doc.qt.io/qt-5/classes.html[The Qt5 reference]
+* https://doc.qt.io/qt-6/classes.html[The Qt 6 reference]
+* https://doc.qt.io/qt-5/classes.html[The Qt 5 reference]
* https://docs.python.org/3/library/index.html[The Python reference]
* https://httpbin.org/[httpbin, a test service for HTTP requests/responses]
* https://requestbin.com/[RequestBin, a service to inspect HTTP requests]
@@ -286,7 +287,7 @@ Other
Languages] (https://www.rfc-editor.org/errata_search.php?rfc=5646[Errata])
* https://www.w3.org/TR/CSS2/[Cascading Style Sheets Level 2 Revision 1 (CSS
2.1) Specification]
-* https://doc.qt.io/qt-5/stylesheet-reference.html[Qt Style Sheets Reference]
+* https://doc.qt.io/qt-6/stylesheet-reference.html[Qt Style Sheets Reference]
* https://mimesniff.spec.whatwg.org/[MIME Sniffing Standard]
* https://spec.whatwg.org/[WHATWG specifications]
* https://www.w3.org/html/wg/drafts/html/master/Overview.html[HTML 5.1 Nightly]
@@ -365,7 +366,7 @@ All objects can be printed by starting with the `--debug` flag and using the
The registry is mainly used for <<commands,command handlers>>, but it can
also be useful in places where using Qt's
-https://doc.qt.io/qt-5/signalsandslots.html[signals and slots] mechanism would
+https://doc.qt.io/qt-6/signalsandslots.html[signals and slots] mechanism would
be difficult.
Logging
@@ -612,11 +613,14 @@ This is mostly useful for qutebrowser maintainers to work around issues in Qt -
The hierarchy of widgets when QtWebEngine is involved looks like this:
- qutebrowser has a `WebEngineTab` object, which is its abstraction over QtWebKit/QtWebEngine.
-- The `WebEngineTab` has a `_widget` attribute, which is the https://doc.qt.io/qt-5/qwebengineview.html[QWebEngineView]
-- That view has a https://doc.qt.io/qt-5/qwebenginepage.html[QWebEnginePage] for everything which doesn't require rendering.
-- The view also has a layout with exactly one element (which also is its `focusProxy()`)
-- That element is the https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp[RenderWidgetHostViewQtDelegateWidget] (it inherits https://doc.qt.io/qt-5/qquickwidget.html[QQuickWidget]) - also often referred to as RWHV or RWHVQDW. It can be obtained via `sip.cast(tab._widget.focusProxy(), QQuickWidget)`.
-- Calling `rootObject()` on that gives us the https://doc.qt.io/qt-5/qquickitem.html[QQuickItem] where Chromium renders into (?). With it, we can do things like `.setRotation(20)`.
+- The `WebEngineTab` has a `_widget` attribute, which is the https://doc.qt.io/qt-6/qwebengineview.html[QWebEngineView]
+- That view has a https://doc.qt.io/qt-6/qwebenginepage.html[QWebEnginePage] for everything which doesn't require rendering.
+- The view also has a layout with exactly one element (which also is its `focusProxy()`).
+ - Qt 5: That element is the https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp?h=5.15[RenderWidgetHostViewQtDelegateWidget] (it inherits https://doc.qt.io/qt-6/qquickwidget.html[QQuickWidget]) - also often referred to as RWHV or RWHVQDW.
+ It can be obtained via `sip.cast(tab._widget.focusProxy(), QQuickWidget)`.
+ - Qt 6: That element is the https://code.qt.io/cgit/qt/qtwebengine.git/tree/src/webenginewidgets/api/qwebengineview.cpp[WebEngineQuickWidget] (it inherits https://doc.qt.io/qt-6/qquickwidget.html[QQuickWidget]).
+ It can be obtained via `tab._widget.focusProxy()`.
+- Calling `rootObject()` on that gives us the https://doc.qt.io/qt-6/qquickitem.html[QQuickItem] where Chromium renders into (?). With it, we can do things like `.setRotation(20)`.
Style conventions
-----------------
diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index d733c4a70..7f0abc71d 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -826,7 +826,7 @@ Show an error message in the statusbar.
* +'text'+: The text to show.
==== optional arguments
-* +*-r*+, +*--rich*+: Render the given text as https://doc.qt.io/qt-5/richtext-html-subset.html[Qt Rich Text].
+* +*-r*+, +*--rich*+: Render the given text as https://doc.qt.io/qt-6/richtext-html-subset.html[Qt Rich Text].
[[message-info]]
@@ -839,7 +839,7 @@ Show an info message in the statusbar.
* +'text'+: The text to show.
==== optional arguments
-* +*-r*+, +*--rich*+: Render the given text as https://doc.qt.io/qt-5/richtext-html-subset.html[Qt Rich Text].
+* +*-r*+, +*--rich*+: Render the given text as https://doc.qt.io/qt-6/richtext-html-subset.html[Qt Rich Text].
==== count
@@ -855,7 +855,7 @@ Show a warning message in the statusbar.
* +'text'+: The text to show.
==== optional arguments
-* +*-r*+, +*--rich*+: Render the given text as https://doc.qt.io/qt-5/richtext-html-subset.html[Qt Rich Text].
+* +*-r*+, +*--rich*+: Render the given text as https://doc.qt.io/qt-6/richtext-html-subset.html[Qt Rich Text].
[[messages]]
@@ -2181,7 +2181,7 @@ Syntax: +:debug-webaction 'action'+
Execute a webaction.
-Available actions: https://doc.qt.io/archives/qt-5.5/qwebpage.html#WebAction-enum (WebKit) https://doc.qt.io/qt-5/qwebenginepage.html#WebAction-enum (WebEngine)
+Available actions: https://doc.qt.io/archives/qt-5.5/qwebpage.html#WebAction-enum (WebKit) https://doc.qt.io/qt-6/qwebenginepage.html#WebAction-enum (WebEngine)
==== positional arguments
* +'action'+: The action to execute, e.g. MoveToNextChar.
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index 32656d461..9e601c5fe 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -3848,7 +3848,7 @@ Alternative process models use less resources, but decrease security and robustn
See the following pages for more details:
- https://www.chromium.org/developers/design-documents/process-models
- - https://doc.qt.io/qt-5/qtwebengine-features.html#process-models
+ - https://doc.qt.io/qt-6/qtwebengine-features.html#process-models
This setting requires a restart.
@@ -4802,7 +4802,7 @@ When setting from a string, pass a json-like list, e.g. `["one", "two"]`.
|Proxy|A proxy URL, or `system`/`none`.
|QssColor|A color value supporting gradients.
-A value can be in one of the following formats: * `#RGB`/`#RRGGBB`/`#AARRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` * An SVG color name as specified in https://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. * 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 https://doc.qt.io/qt-5/stylesheet-reference.html#list-of-property-types[the Qt documentation] under ``Gradient''
+A value can be in one of the following formats: * `#RGB`/`#RRGGBB`/`#AARRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` * An SVG color name as specified in https://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. * 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 https://doc.qt.io/qt-6/stylesheet-reference.html#list-of-property-types[the Qt documentation] under ``Gradient''
|QtColor|A color value.
A value can be in one of the following formats: * `#RGB`/`#RRGGBB`/`#AARRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` * An SVG color name as specified in https://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. * 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)
diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc
index e83a4da0b..377cb512f 100644
--- a/doc/qutebrowser.1.asciidoc
+++ b/doc/qutebrowser.1.asciidoc
@@ -63,7 +63,7 @@ show it.
Which backend to use.
*--desktop-file-name* 'DESKTOP_FILE_NAME'::
- Set the base name of the desktop entry for this application. Used to set the app_id under Wayland. See https://doc.qt.io/qt-5/qguiapplication.html#desktopFileName-prop
+ Set the base name of the desktop entry for this application. Used to set the app_id under Wayland. See https://doc.qt.io/qt-6/qguiapplication.html#desktopFileName-prop
*--untrusted-args*::
Mark all following arguments as untrusted, which enforces that they are URLs/search terms (and not flags or commands)
diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py
index 4022337c4..3261d0d86 100644
--- a/qutebrowser/browser/network/proxy.py
+++ b/qutebrowser/browser/network/proxy.py
@@ -97,7 +97,7 @@ class ProxyFactory(QNetworkProxyFactory):
if proxy is configtypes.SYSTEM_PROXY:
# On Linux, use "export http_proxy=socks5://host:port" to manually
# set system proxy.
- # ref. https://doc.qt.io/qt-5/qnetworkproxyfactory.html#systemProxyForQuery
+ # ref. https://doc.qt.io/qt-6/qnetworkproxyfactory.html#systemProxyForQuery
proxies = QNetworkProxyFactory.systemProxyForQuery(query)
elif isinstance(proxy, pac.PACFetcher):
if objects.backend == usertypes.Backend.QtWebEngine:
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 566795fda..5c5d9ccfc 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -814,7 +814,7 @@ class WebEngineAudio(browsertab.AbstractAudio):
self._overridden = False
# Implements the intended two-second delay specified at
- # https://doc.qt.io/qt-5/qwebenginepage.html#recentlyAudibleChanged
+ # https://doc.qt.io/archives/qt-5.14/qwebenginepage.html#recentlyAudibleChanged
delay_ms = 2000
self._silence_timer = QTimer(self)
self._silence_timer.setSingleShot(True)
diff --git a/qutebrowser/components/misccommands.py b/qutebrowser/components/misccommands.py
index c31ec5e6c..f1f6ccfc1 100644
--- a/qutebrowser/components/misccommands.py
+++ b/qutebrowser/components/misccommands.py
@@ -324,7 +324,7 @@ def debug_webaction(tab: apitypes.Tab, action: str, count: int = 1) -> None:
Available actions:
https://doc.qt.io/archives/qt-5.5/qwebpage.html#WebAction-enum (WebKit)
- https://doc.qt.io/qt-5/qwebenginepage.html#WebAction-enum (WebEngine)
+ https://doc.qt.io/qt-6/qwebenginepage.html#WebAction-enum (WebEngine)
Args:
action: The action to execute, e.g. MoveToNextChar.
@@ -365,7 +365,7 @@ def message_error(text: str, rich: bool = False) -> None:
Args:
text: The text to show.
rich: Render the given text as
- https://doc.qt.io/qt-5/richtext-html-subset.html[Qt Rich Text].
+ https://doc.qt.io/qt-6/richtext-html-subset.html[Qt Rich Text].
"""
message.error(text, rich=rich)
@@ -379,7 +379,7 @@ def message_info(text: str, count: int = 1, rich: bool = False) -> None:
text: The text to show.
count: How many times to show the message.
rich: Render the given text as
- https://doc.qt.io/qt-5/richtext-html-subset.html[Qt Rich Text].
+ https://doc.qt.io/qt-6/richtext-html-subset.html[Qt Rich Text].
"""
for _ in range(count):
message.info(text, rich=rich)
@@ -392,7 +392,7 @@ def message_warning(text: str, rich: bool = False) -> None:
Args:
text: The text to show.
rich: Render the given text as
- https://doc.qt.io/qt-5/richtext-html-subset.html[Qt Rich Text].
+ https://doc.qt.io/qt-6/richtext-html-subset.html[Qt Rich Text].
"""
message.warning(text, rich=rich)
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index afd83585f..b7e8d8175 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -272,7 +272,7 @@ qt.chromium.process_model:
See the following pages for more details:
- https://www.chromium.org/developers/design-documents/process-models
- - https://doc.qt.io/qt-5/qtwebengine-features.html#process-models
+ - https://doc.qt.io/qt-6/qtwebengine-features.html#process-models
qt.low_end_device_mode:
renamed: qt.chromium.low_end_device_mode
diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py
index fc134559b..17952e55a 100644
--- a/qutebrowser/config/configtypes.py
+++ b/qutebrowser/config/configtypes.py
@@ -1167,7 +1167,7 @@ class QssColor(BaseType):
* `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
- https://doc.qt.io/qt-5/stylesheet-reference.html#list-of-property-types[the Qt documentation]
+ https://doc.qt.io/qt-6/stylesheet-reference.html#list-of-property-types[the Qt documentation]
under ``Gradient''
"""
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index 9eb5cc6fb..f1273dee3 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -86,7 +86,7 @@ def get_argparser():
default="org.qutebrowser.qutebrowser",
help="Set the base name of the desktop entry for this "
"application. Used to set the app_id under Wayland. See "
- "https://doc.qt.io/qt-5/qguiapplication.html#desktopFileName-prop")
+ "https://doc.qt.io/qt-6/qguiapplication.html#desktopFileName-prop")
parser.add_argument('--untrusted-args',
action='store_true',
help="Mark all following arguments as untrusted, which "