Blanket PyQt5 -> PyQt6

24 files changed, 44 insertions, 44 deletions

diff --git a/misc/nsis/qutebrowser.nsi b/misc/nsis/qutebrowser.nsi
index 51f3b623d..f1e7e7bd9 100755
--- a/misc/nsis/qutebrowser.nsi
+++ b/misc/nsis/qutebrowser.nsi
@@ -57,7 +57,7 @@ ShowUninstDetails hide
 !define URL_UPDATE "https://qutebrowser.org/doc/install.html"

 !define HELP_LINK "https://qutebrowser.org/doc/help/"

 !define CONTACT "mail@qutebrowser.org"

-!define COMMENTS "A keyboard-driven, vim-like browser based on PyQt5."

+!define COMMENTS "A keyboard-driven, vim-like browser based on PyQt6."

 !define LANGID "1033" ; U.S. English

 !define MIN_WIN_VER "8"

 !define SETUP_MUTEX "${PRODUCT_NAME} Setup Mutex" ; do not change this between program versions!

diff --git a/misc/org.qutebrowser.qutebrowser.appdata.xml b/misc/org.qutebrowser.qutebrowser.appdata.xml
index 7c382cbb3..9995599a5 100644
--- a/misc/org.qutebrowser.qutebrowser.appdata.xml
+++ b/misc/org.qutebrowser.qutebrowser.appdata.xml
@@ -10,7 +10,7 @@
 		<p>
 			qutebrowser is a keyboard-focused browser with a minimal GUI.
 			It was inspired by other browsers/addons like dwb and Vimperator/Pentadactyl,
-			and is based on Python and PyQt5.
+			and is based on Python and PyQt6.
 		</p>
 	</description>
 	<categories>
diff --git a/misc/org.qutebrowser.qutebrowser.desktop b/misc/org.qutebrowser.qutebrowser.desktop
index 52144b3c5..8d32b3def 100644
--- a/misc/org.qutebrowser.qutebrowser.desktop
+++ b/misc/org.qutebrowser.qutebrowser.desktop
@@ -39,9 +39,9 @@ GenericName[ta]=இணைய உலாவி
 GenericName[th]=เว็บเบราว์เซอร์
 GenericName[tr]=Web Tarayıcı
 GenericName[uk]=Навігатор Тенет瀏覽器
-Comment=A keyboard-driven, vim-like browser based on PyQt5
-Comment[de]=Ein Tastatur-gesteuerter, vim-ähnlicher Browser basierend auf PyQt5
-Comment[it]= Un browser web vim-like utilizzabile da tastiera basato su PyQt5
+Comment=A keyboard-driven, vim-like browser based on PyQt6
+Comment[de]=Ein Tastatur-gesteuerter, vim-ähnlicher Browser basierend auf PyQt6
+Comment[it]= Un browser web vim-like utilizzabile da tastiera basato su PyQt6
 Icon=qutebrowser
 Type=Application
 Categories=Network;WebBrowser;
diff --git a/misc/qutebrowser.spec b/misc/qutebrowser.spec
index ffb17d371..89eed788b 100644
--- a/misc/qutebrowser.spec
+++ b/misc/qutebrowser.spec
@@ -30,7 +30,7 @@ def get_data_files():
 
 
 def get_hidden_imports():
-    imports = ['PyQt5.QtOpenGL', 'PyQt5._QOpenGLFunctions_2_0']
+    imports = ['PyQt6.QtOpenGL', 'PyQt6._QOpenGLFunctions_2_0']
     for info in loader.walk_components():
         imports.append(info.name)
     return imports
@@ -84,5 +84,5 @@ coll = COLLECT(exe,
 app = BUNDLE(coll,
              name='qutebrowser.app',
              icon=icon,
-             # https://github.com/pyinstaller/pyinstaller/blob/b78bfe530cdc2904f65ce098bdf2de08c9037abb/PyInstaller/hooks/hook-PyQt5.QtWebEngineWidgets.py#L24
+             # https://github.com/pyinstaller/pyinstaller/blob/b78bfe530cdc2904f65ce098bdf2de08c9037abb/PyInstaller/hooks/hook-PyQt6.QtWebEngineWidgets.py#L24
              bundle_identifier='org.qt-project.Qt.QtWebEngineCore')
diff --git a/misc/requirements/requirements-mypy.txt b/misc/requirements/requirements-mypy.txt
index 1ef2a054d..a7e47b6ec 100644
--- a/misc/requirements/requirements-mypy.txt
+++ b/misc/requirements/requirements-mypy.txt
@@ -13,7 +13,7 @@ mypy==0.910
 mypy-extensions==0.4.3
 pluggy==0.13.1
 Pygments==2.10.0
-PyQt5-stubs==5.15.2.0
+PyQt6-stubs==5.15.2.0
 toml==0.10.2
 types-dataclasses==0.1.7
 types-PyYAML==5.4.6
diff --git a/misc/requirements/requirements-mypy.txt-raw b/misc/requirements/requirements-mypy.txt-raw
index 4baeec11f..0a70ce7df 100644
--- a/misc/requirements/requirements-mypy.txt-raw
+++ b/misc/requirements/requirements-mypy.txt-raw
@@ -2,7 +2,7 @@ mypy
 lxml  # For HTML reports
 diff-cover
 
-PyQt5-stubs
+PyQt6-stubs
 types-dataclasses
 types-PyYAML
 
diff --git a/misc/requirements/requirements-pyqt-5.12.txt b/misc/requirements/requirements-pyqt-5.12.txt
index 890306127..638f2aae5 100644
--- a/misc/requirements/requirements-pyqt-5.12.txt
+++ b/misc/requirements/requirements-pyqt-5.12.txt
@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.12.3  # rq.filter: < 5.13
-PyQt5-sip==12.9.0
+PyQt6==5.12.3  # rq.filter: < 5.13
+PyQt6-sip==12.9.0
 PyQtWebEngine==5.12.1  # rq.filter: < 5.13
diff --git a/misc/requirements/requirements-pyqt-5.12.txt-raw b/misc/requirements/requirements-pyqt-5.12.txt-raw
index f127ba42f..39d400c4c 100644
--- a/misc/requirements/requirements-pyqt-5.12.txt-raw
+++ b/misc/requirements/requirements-pyqt-5.12.txt-raw
@@ -1,4 +1,4 @@
-#@ filter: PyQt5 < 5.13
+#@ filter: PyQt6 < 5.13
 #@ filter: PyQtWebEngine < 5.13
-PyQt5 >= 5.12, < 5.13
+PyQt6 >= 5.12, < 5.13
 PyQtWebEngine >= 5.12, < 5.13
diff --git a/misc/requirements/requirements-pyqt-5.13.txt b/misc/requirements/requirements-pyqt-5.13.txt
index 5f4da4758..f60eb9d48 100644
--- a/misc/requirements/requirements-pyqt-5.13.txt
+++ b/misc/requirements/requirements-pyqt-5.13.txt
@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.13.2  # rq.filter: < 5.14
-PyQt5-sip==12.9.0
+PyQt6==5.13.2  # rq.filter: < 5.14
+PyQt6-sip==12.9.0
 PyQtWebEngine==5.13.2  # rq.filter: < 5.14
diff --git a/misc/requirements/requirements-pyqt-5.13.txt-raw b/misc/requirements/requirements-pyqt-5.13.txt-raw
index e60db7edb..350f2a332 100644
--- a/misc/requirements/requirements-pyqt-5.13.txt-raw
+++ b/misc/requirements/requirements-pyqt-5.13.txt-raw
@@ -1,4 +1,4 @@
-#@ filter: PyQt5 < 5.14
+#@ filter: PyQt6 < 5.14
 #@ filter: PyQtWebEngine < 5.14
-PyQt5 >= 5.13, < 5.14
+PyQt6 >= 5.13, < 5.14
 PyQtWebEngine >= 5.13, < 5.14
diff --git a/misc/requirements/requirements-pyqt-5.14.txt b/misc/requirements/requirements-pyqt-5.14.txt
index 9ce643666..b963c8e76 100644
--- a/misc/requirements/requirements-pyqt-5.14.txt
+++ b/misc/requirements/requirements-pyqt-5.14.txt
@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.14.2  # rq.filter: < 5.15
-PyQt5-sip==12.9.0
+PyQt6==5.14.2  # rq.filter: < 5.15
+PyQt6-sip==12.9.0
 PyQtWebEngine==5.14.0  # rq.filter: < 5.15
diff --git a/misc/requirements/requirements-pyqt-5.14.txt-raw b/misc/requirements/requirements-pyqt-5.14.txt-raw
index 9dadfc846..79a389f01 100644
--- a/misc/requirements/requirements-pyqt-5.14.txt-raw
+++ b/misc/requirements/requirements-pyqt-5.14.txt-raw
@@ -1,4 +1,4 @@
-#@ filter: PyQt5 < 5.15
+#@ filter: PyQt6 < 5.15
 #@ filter: PyQtWebEngine < 5.15
-PyQt5 >= 5.14, < 5.15
+PyQt6 >= 5.14, < 5.15
 PyQtWebEngine >= 5.14, < 5.15
diff --git a/misc/requirements/requirements-pyqt-5.15.0.txt b/misc/requirements/requirements-pyqt-5.15.0.txt
index b111a93f3..9f9e3953f 100644
--- a/misc/requirements/requirements-pyqt-5.15.0.txt
+++ b/misc/requirements/requirements-pyqt-5.15.0.txt
@@ -1,5 +1,5 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.15.0  # rq.filter: == 5.15.0
-PyQt5-sip==12.9.0
+PyQt6==5.15.0  # rq.filter: == 5.15.0
+PyQt6-sip==12.9.0
 PyQtWebEngine==5.15.0  # rq.filter: == 5.15.0
diff --git a/misc/requirements/requirements-pyqt-5.15.0.txt-raw b/misc/requirements/requirements-pyqt-5.15.0.txt-raw
index 12d6adb7d..e498f5462 100644
--- a/misc/requirements/requirements-pyqt-5.15.0.txt-raw
+++ b/misc/requirements/requirements-pyqt-5.15.0.txt-raw
@@ -1,4 +1,4 @@
-#@ filter: PyQt5 == 5.15.0
+#@ filter: PyQt6 == 5.15.0
 #@ filter: PyQtWebEngine == 5.15.0
-PyQt5 == 5.15.0
+PyQt6 == 5.15.0
 PyQtWebEngine == 5.15.0
diff --git a/misc/requirements/requirements-pyqt-5.15.txt b/misc/requirements/requirements-pyqt-5.15.txt
index 8b7a53c44..6f05d2d0e 100644
--- a/misc/requirements/requirements-pyqt-5.15.txt
+++ b/misc/requirements/requirements-pyqt-5.15.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.15.4  # rq.filter: < 5.16
-PyQt5-Qt5==5.15.2
-PyQt5-sip==12.9.0
+PyQt6==5.15.4  # rq.filter: < 5.16
+PyQt6-Qt5==5.15.2
+PyQt6-sip==12.9.0
 PyQtWebEngine==5.15.4  # rq.filter: < 5.16
 PyQtWebEngine-Qt5==5.15.2
diff --git a/misc/requirements/requirements-pyqt-5.15.txt-raw b/misc/requirements/requirements-pyqt-5.15.txt-raw
index be3a85350..a727dcc8a 100644
--- a/misc/requirements/requirements-pyqt-5.15.txt-raw
+++ b/misc/requirements/requirements-pyqt-5.15.txt-raw
@@ -1,4 +1,4 @@
-#@ filter: PyQt5 < 5.16
+#@ filter: PyQt6 < 5.16
 #@ filter: PyQtWebEngine < 5.16
-PyQt5 >= 5.15, < 5.16
+PyQt6 >= 5.15, < 5.16
 PyQtWebEngine >= 5.15, < 5.16
diff --git a/misc/requirements/requirements-pyqt-pyinstaller.txt b/misc/requirements/requirements-pyqt-pyinstaller.txt
index 678a1d7ea..fae0aa33a 100644
--- a/misc/requirements/requirements-pyqt-pyinstaller.txt
+++ b/misc/requirements/requirements-pyqt-pyinstaller.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.15.3
-PyQt5-Qt==5.15.2
-PyQt5-sip==12.9.0
+PyQt6==5.15.3
+PyQt6-Qt==5.15.2
+PyQt6-sip==12.9.0
 PyQtWebEngine==5.15.3
 PyQtWebEngine-Qt==5.15.2
diff --git a/misc/requirements/requirements-pyqt-pyinstaller.txt-raw b/misc/requirements/requirements-pyqt-pyinstaller.txt-raw
index 89b5644da..700d33553 100644
--- a/misc/requirements/requirements-pyqt-pyinstaller.txt-raw
+++ b/misc/requirements/requirements-pyqt-pyinstaller.txt-raw
@@ -1,2 +1,2 @@
-PyQt5==5.15.3
+PyQt6==5.15.3
 PyQtWebEngine==5.15.3
diff --git a/misc/requirements/requirements-pyqt.txt b/misc/requirements/requirements-pyqt.txt
index 75ef27bf4..18bd23f11 100644
--- a/misc/requirements/requirements-pyqt.txt
+++ b/misc/requirements/requirements-pyqt.txt
@@ -1,7 +1,7 @@
 # This file is automatically generated by scripts/dev/recompile_requirements.py
 
-PyQt5==5.15.4
-PyQt5-Qt5==5.15.2
-PyQt5-sip==12.9.0
+PyQt6==5.15.4
+PyQt6-Qt5==5.15.2
+PyQt6-sip==12.9.0
 PyQtWebEngine==5.15.4
 PyQtWebEngine-Qt5==5.15.2
diff --git a/misc/requirements/requirements-pyqt.txt-raw b/misc/requirements/requirements-pyqt.txt-raw
index 9c6afbf16..67aa103ad 100644
--- a/misc/requirements/requirements-pyqt.txt-raw
+++ b/misc/requirements/requirements-pyqt.txt-raw
@@ -1,2 +1,2 @@
-PyQt5
+PyQt6
 PyQtWebEngine
diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw
index e07ea992a..4957ec6e1 100644
--- a/misc/requirements/requirements-qutebrowser.txt-raw
+++ b/misc/requirements/requirements-qutebrowser.txt-raw
@@ -10,7 +10,7 @@ Pygments  # For :view-source --pygments or on QtWebKit
 colorama  # Colored log output on Windows
 adblock  # Improved adblocking
 
-# Optional, only relevant when installing PyQt5/PyQtWebEngine via pip.
+# Optional, only relevant when installing PyQt6/PyQtWebEngine via pip.
 importlib-metadata  # Determining PyQt version
 typing_extensions  # from importlib-metadata
 
diff --git a/misc/userscripts/add-nextcloud-bookmarks b/misc/userscripts/add-nextcloud-bookmarks
index 86f4f5bc7..08113bd59 100755
--- a/misc/userscripts/add-nextcloud-bookmarks
+++ b/misc/userscripts/add-nextcloud-bookmarks
@@ -41,7 +41,7 @@ from json import dumps
 from os import environ, path
 from sys import argv, exit
 
-from PyQt5.QtWidgets import QApplication, QInputDialog, QLineEdit
+from PyQt6.QtWidgets import QApplication, QInputDialog, QLineEdit
 from requests import get, post
 from requests.auth import HTTPBasicAuth
 
diff --git a/misc/userscripts/add-nextcloud-cookbook b/misc/userscripts/add-nextcloud-cookbook
index 3952bb16f..5226c02c5 100755
--- a/misc/userscripts/add-nextcloud-cookbook
+++ b/misc/userscripts/add-nextcloud-cookbook
@@ -37,7 +37,7 @@ import configparser
 from os import environ, path
 from sys import argv, exit
 
-from PyQt5.QtWidgets import QApplication, QInputDialog, QLineEdit
+from PyQt6.QtWidgets import QApplication, QInputDialog, QLineEdit
 from requests import post
 from requests.auth import HTTPBasicAuth
 
diff --git a/misc/userscripts/qute-keepass b/misc/userscripts/qute-keepass
index 285377ffc..7c5eb5bbd 100755
--- a/misc/userscripts/qute-keepass
+++ b/misc/userscripts/qute-keepass
@@ -42,7 +42,7 @@ you do not do this, you will get 'element not editable' errors.
 If keepass takes a while to open the DB, you might want to consider reducing
 the number of transform rounds in your database settings.
 
-Dependencies: pykeepass (in python3), PyQt5. Without pykeepass, you will get an
+Dependencies: pykeepass (in python3), PyQt6. Without pykeepass, you will get an
 exit code of 100.
 
 ********************!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!******************
@@ -64,8 +64,8 @@ import shlex
 import subprocess
 import sys
 
-from PyQt5.QtCore import QUrl
-from PyQt5.QtWidgets import QApplication, QInputDialog, QLineEdit
+from PyQt6.QtCore import QUrl
+from PyQt6.QtWidgets import QApplication, QInputDialog, QLineEdit
 
 try:
     import pykeepass