Adjust some fixme comments

38 files changed, 42 insertions, 48 deletions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95a52a829..f52d7fdba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
         include:
           - testenv: pylint
           - testenv: flake8
-          # FIXME:qt6
+          # FIXME:qt6 (lint)
           # - testenv: mypy
           - testenv: docs
           - testenv: vulture
diff --git a/.pylintrc b/.pylintrc
index 6365be3c3..3b2461399 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -58,8 +58,8 @@ disable=locally-disabled,
         missing-type-doc,
         missing-param-doc,
         useless-param-doc,
-        wrong-import-order,  # FIXME:qt6
-        ungrouped-imports,  # FIXME:qt6
+        wrong-import-order,  # FIXME:qt6 (lint)
+        ungrouped-imports,  # FIXME:qt6 (lint)
 
 [BASIC]
 function-rgx=[a-z_][a-z0-9_]{2,50}$
@@ -74,7 +74,7 @@ no-docstring-rgx=(^_|^main$)
 class-const-naming-style = snake_case
 
 [FORMAT]
-# FIXME:qt6 down to 88 again once we use black
+# FIXME:qt6 (lint) down to 88 again once we use black
 max-line-length=190
 ignore-long-lines=(<?https?://|file://|^# Copyright 201\d|link:)
 expected-line-ending-format=LF
diff --git a/qutebrowser/browser/webkit/webkitelem.py b/qutebrowser/browser/webkit/webkitelem.py
index af0489635..c44f675e7 100644
--- a/qutebrowser/browser/webkit/webkitelem.py
+++ b/qutebrowser/browser/webkit/webkitelem.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """QtWebKit specific part of the web element API."""
diff --git a/qutebrowser/browser/webkit/webkithistory.py b/qutebrowser/browser/webkit/webkithistory.py
index aa1bd5aed..549a4d545 100644
--- a/qutebrowser/browser/webkit/webkithistory.py
+++ b/qutebrowser/browser/webkit/webkithistory.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """QtWebKit specific part of history."""
diff --git a/qutebrowser/browser/webkit/webkitinspector.py b/qutebrowser/browser/webkit/webkitinspector.py
index a3b13eee9..69e1c7e24 100644
--- a/qutebrowser/browser/webkit/webkitinspector.py
+++ b/qutebrowser/browser/webkit/webkitinspector.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """Customized QWebInspector for QtWebKit."""
diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py
index 86895a412..87dc30327 100644
--- a/qutebrowser/browser/webkit/webkitsettings.py
+++ b/qutebrowser/browser/webkit/webkitsettings.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """Bridge from QWebSettings to our own settings.
diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py
index 31c132f2c..0916a0a64 100644
--- a/qutebrowser/browser/webkit/webkittab.py
+++ b/qutebrowser/browser/webkit/webkittab.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """Wrapper over our (QtWebKit) WebView."""
diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 1a6e7ea82..2dd4551b9 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """The main browser widgets."""
diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py
index f5d253029..aaeba4033 100644
--- a/qutebrowser/browser/webkit/webview.py
+++ b/qutebrowser/browser/webkit/webview.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """The main browser widgets."""
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index 9c5e99374..6306437ec 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -156,7 +156,6 @@ def _parse_yaml_backends_dict(
     # The value associated to the key, and whether we should add that backend
     # or not.
 
-    # FIXME:qt6 Can we drop this?
     conditionals = {
         True: True,
         False: False,
diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py
index f34f9d24e..881b83d81 100644
--- a/qutebrowser/misc/backendproblem.py
+++ b/qutebrowser/misc/backendproblem.py
@@ -383,9 +383,7 @@ class _BackendProblemChecker:
         """Avoid crashing software rendering settings.
 
         WORKAROUND for https://bugreports.qt.io/browse/QTBUG-103372
-        Hopefully fixed with Qt 6.3.1.
-
-        FIXME:qt6 update
+        Fixed with Qt 6.3.1.
         """
         self._assert_backend(usertypes.Backend.QtWebEngine)
 
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py
index ad12c9709..8be4669bf 100644
--- a/qutebrowser/misc/earlyinit.py
+++ b/qutebrowser/misc/earlyinit.py
@@ -264,7 +264,7 @@ def configure_pyqt():
         sip.enableoverflowchecking(True)
     except AttributeError:
         # default in PyQt6
-        # FIXME:qt6 solve this in qutebrowser/qt/sip.py equivalent
+        # FIXME:qt6 solve this in qutebrowser/qt/sip.py equivalent?
         pass
 
     # WORKAROUND for
diff --git a/qutebrowser/qt/core.py b/qutebrowser/qt/core.py
index 0c65720ad..d29413c64 100644
--- a/qutebrowser/qt/core.py
+++ b/qutebrowser/qt/core.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/dbus.py b/qutebrowser/qt/dbus.py
index e42e40317..e257ba38b 100644
--- a/qutebrowser/qt/dbus.py
+++ b/qutebrowser/qt/dbus.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/gui.py b/qutebrowser/qt/gui.py
index f5312ecae..29a962541 100644
--- a/qutebrowser/qt/gui.py
+++ b/qutebrowser/qt/gui.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import,unused-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py
index 81bcaf30a..0a2de9259 100644
--- a/qutebrowser/qt/machinery.py
+++ b/qutebrowser/qt/machinery.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring
 # flake8: noqa
 
@@ -39,8 +39,6 @@ def _autoselect_wrapper():
         except ImportError:
             # FIXME:qt6 show/log this somewhere?
             continue
-
-        # FIXME:qt6 what to do if none are available?
         return wrapper
 
     wrappers = ", ".join(_WRAPPERS)
diff --git a/qutebrowser/qt/network.py b/qutebrowser/qt/network.py
index d7d74c12b..ebb28561a 100644
--- a/qutebrowser/qt/network.py
+++ b/qutebrowser/qt/network.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/opengl.py b/qutebrowser/qt/opengl.py
index 1c1086b6f..4a61fbb95 100644
--- a/qutebrowser/qt/opengl.py
+++ b/qutebrowser/qt/opengl.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/printsupport.py b/qutebrowser/qt/printsupport.py
index 9958e0503..b0a244280 100644
--- a/qutebrowser/qt/printsupport.py
+++ b/qutebrowser/qt/printsupport.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/qml.py b/qutebrowser/qt/qml.py
index 61e189208..471a9051a 100644
--- a/qutebrowser/qt/qml.py
+++ b/qutebrowser/qt/qml.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/sip.py b/qutebrowser/qt/sip.py
index 213c4dffb..07682f24e 100644
--- a/qutebrowser/qt/sip.py
+++ b/qutebrowser/qt/sip.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/sql.py b/qutebrowser/qt/sql.py
index 1e65b66c3..50a6b9d33 100644
--- a/qutebrowser/qt/sql.py
+++ b/qutebrowser/qt/sql.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/test.py b/qutebrowser/qt/test.py
index 6e262bf99..2d13107e9 100644
--- a/qutebrowser/qt/test.py
+++ b/qutebrowser/qt/test.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/webenginecore.py b/qutebrowser/qt/webenginecore.py
index f0cd1dd1b..1a685cb96 100644
--- a/qutebrowser/qt/webenginecore.py
+++ b/qutebrowser/qt/webenginecore.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import,unused-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/webenginewidgets.py b/qutebrowser/qt/webenginewidgets.py
index 784e780db..27f422e45 100644
--- a/qutebrowser/qt/webenginewidgets.py
+++ b/qutebrowser/qt/webenginewidgets.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/webkit.py b/qutebrowser/qt/webkit.py
index d608584f0..3b098933f 100644
--- a/qutebrowser/qt/webkit.py
+++ b/qutebrowser/qt/webkit.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/webkitwidgets.py b/qutebrowser/qt/webkitwidgets.py
index c846331b1..23ea42a8f 100644
--- a/qutebrowser/qt/webkitwidgets.py
+++ b/qutebrowser/qt/webkitwidgets.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qt/widgets.py b/qutebrowser/qt/widgets.py
index 1d06f168d..4b2cde488 100644
--- a/qutebrowser/qt/widgets.py
+++ b/qutebrowser/qt/widgets.py
@@ -1,5 +1,5 @@
 # vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=missing-module-docstring,import-error,wildcard-import,unused-wildcard-import
 # flake8: noqa
 
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index cd120cc78..9eb5cc6fb 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -52,7 +52,7 @@ except ImportError:
         sys.exit(100)
 check_python_version()
 
-import argparse  # FIXME:qt6: disable=wrong-import-order
+import argparse  # FIXME:qt6 (lint): disable=wrong-import-order
 from qutebrowser.misc import earlyinit
 
 
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 4ca306b61..e301be5b6 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -1022,7 +1022,7 @@ def opengl_info() -> Optional[OpenGLInfo]:  # pragma: no cover
                 vf = ctx.versionFunctions(vp)
             except AttributeError:
                 # Qt 6
-                # FIXME:qt6
+                # FIXME:qt6 (lint)
                 # pylint: disable-next=no-name-in-module
                 from qutebrowser.qt.opengl import QOpenGLVersionFunctionsFactory
                 vf = QOpenGLVersionFunctionsFactory.get(vp, ctx)
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py
index 10024c6aa..7aed692d0 100755
--- a/scripts/mkvenv.py
+++ b/scripts/mkvenv.py
@@ -303,7 +303,7 @@ def apply_xcb_util_workaround(
     if pyqt_type != 'binary':
         print("Workaround not needed: Not installing from PyQt binaries.")
         return
-    if pyqt_version not in ['auto', '5.15']:  # FIXME:qt6
+    if pyqt_version not in ['auto', '5.15']:  # FIXME:qt6 Remove once auto = Qt 6
         print("Workaround not needed: Not installing Qt 5.15.")
         return
 
diff --git a/tests/end2end/features/test_search_bdd.py b/tests/end2end/features/test_search_bdd.py
index b4f9f4e91..563152b65 100644
--- a/tests/end2end/features/test_search_bdd.py
+++ b/tests/end2end/features/test_search_bdd.py
@@ -38,7 +38,6 @@ def check_found_text(request, quteproc, text):
         # https://codereview.qt-project.org/#/c/192921/
         # https://bugreports.qt.io/browse/QTBUG-53134
         # FIXME: Doesn't actually work, investigate why.
-        # FIXME:qt6 try again
         return
     quteproc.send_cmd(':yank selection')
     quteproc.wait_for(message='Setting fake clipboard: {}'.format(
diff --git a/tests/unit/browser/webengine/test_darkmode.py b/tests/unit/browser/webengine/test_darkmode.py
index 70dfbbad0..eab7af511 100644
--- a/tests/unit/browser/webengine/test_darkmode.py
+++ b/tests/unit/browser/webengine/test_darkmode.py
@@ -44,22 +44,22 @@ def gentoo_versions():
     # Auto
     ("auto", "5.15.2", [("preferredColorScheme", "2")]),  # QTBUG-89753
     ("auto", "5.15.3", []),
-    ("auto", "6.2.0", []),  # FIXME:qt6
+    ("auto", "6.2.0", []),
 
     # Unset
     (None, "5.15.2", [("preferredColorScheme", "2")]),  # QTBUG-89753
     (None, "5.15.3", []),
-    (None, "6.2.0", []),  # FIXME:qt6
+    (None, "6.2.0", []),
 
     # Dark
     ("dark", "5.15.2", [("preferredColorScheme", "1")]),
     ("dark", "5.15.3", [("preferredColorScheme", "0")]),
-    ("dark", "6.2.0", [("preferredColorScheme", "0")]),  # FIXME:qt6
+    ("dark", "6.2.0", [("preferredColorScheme", "0")]),
 
     # Light
     ("light", "5.15.2", [("preferredColorScheme", "2")]),
     ("light", "5.15.3", [("preferredColorScheme", "1")]),
-    ("light", "6.2.0", [("preferredColorScheme", "1")]),  # FIXME:qt6
+    ("light", "6.2.0", [("preferredColorScheme", "1")]),
 ])
 def test_colorscheme(config_stub, value, webengine_version, expected):
     versions = version.WebEngineVersions.from_pyqt(webengine_version)
@@ -184,7 +184,7 @@ def test_customization(config_stub, setting, value, exp_key, exp_val):
 @pytest.mark.parametrize('webengine_version, expected', [
     ('5.15.2', darkmode.Variant.qt_515_2),
     ('5.15.3', darkmode.Variant.qt_515_3),
-    ('6.2.0', darkmode.Variant.qt_515_3),  # FIXME:qt6
+    ('6.2.0', darkmode.Variant.qt_515_3),
 ])
 def test_variant(webengine_version, expected):
     versions = version.WebEngineVersions.from_pyqt(webengine_version)
diff --git a/tests/unit/browser/webkit/test_tabhistory.py b/tests/unit/browser/webkit/test_tabhistory.py
index f143e5953..db9d1abcb 100644
--- a/tests/unit/browser/webkit/test_tabhistory.py
+++ b/tests/unit/browser/webkit/test_tabhistory.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """Tests for webelement.tabhistory."""
diff --git a/tests/unit/javascript/test_js_execution.py b/tests/unit/javascript/test_js_execution.py
index d83a54ade..8a21d415a 100644
--- a/tests/unit/javascript/test_js_execution.py
+++ b/tests/unit/javascript/test_js_execution.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6
+# FIXME:qt6 (lint)
 # pylint: disable=no-name-in-module
 
 """Check how Qt behaves when trying to execute JS."""
diff --git a/tests/unit/keyinput/key_data.py b/tests/unit/keyinput/key_data.py
index 212ff3cfa..b0819c699 100644
--- a/tests/unit/keyinput/key_data.py
+++ b/tests/unit/keyinput/key_data.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with qutebrowser.  If not, see <https://www.gnu.org/licenses/>.
 
-# FIXME:qt6: disable=line-too-long
+# FIXME:qt6 (lint): disable=line-too-long
 
 
 """Data used by test_keyutils.py to test all keys."""
diff --git a/tests/unit/misc/userscripts/test_qute_lastpass.py b/tests/unit/misc/userscripts/test_qute_lastpass.py
index 479885def..aca3bb224 100644
--- a/tests/unit/misc/userscripts/test_qute_lastpass.py
+++ b/tests/unit/misc/userscripts/test_qute_lastpass.py
@@ -203,7 +203,7 @@ class TestQuteLastPassMain:
         exit_code = qute_lastpass.main(arguments_mock)
 
         assert exit_code == qute_lastpass.ExitCodes.FAILURE
-        # FIXME:qt6: disable=line-too-long
+        # FIXME:qt6 (lint): disable=line-too-long
         stderr_mock.assert_called_with(
             "LastPass CLI returned for www.example.com - Error: Could not find decryption key. Perhaps you need to login with `lpass login`.")
         qutecommand_mock.assert_not_called()
diff --git a/tests/unit/utils/test_urlmatch.py b/tests/unit/utils/test_urlmatch.py
index 9d625f827..c1b9e11be 100644
--- a/tests/unit/utils/test_urlmatch.py
+++ b/tests/unit/utils/test_urlmatch.py
@@ -37,7 +37,7 @@ from qutebrowser.qt.core import QUrl
 
 from qutebrowser.utils import urlmatch
 
-# FIXME:qt6: disable=line-too-long
+# FIXME:qt6 (lint): disable=line-too-long
 
 
 @pytest.mark.parametrize('pattern, error', [