Merge branch 'qt6-v2' into master-qt6

22 files changed, 65 insertions, 37 deletions

diff --git a/misc/qutebrowser.spec b/misc/qutebrowser.spec
index e12e9a9b0..467994bab 100644
--- a/misc/qutebrowser.spec
+++ b/misc/qutebrowser.spec
@@ -82,7 +82,7 @@ def get_data_files():
 
 
 def get_hidden_imports():
-    imports = ['PyQt5.QtOpenGL', 'PyQt5._QOpenGLFunctions_2_0']
+    imports = [] if "PYINSTALLER_QT6" in os.environ else ['PyQt5.QtOpenGL']
     for info in loader.walk_components():
         imports.append(info.name)
     return imports
diff --git a/misc/requirements/requirements-pyqt-5.12.txt b/misc/requirements/requirements-pyqt-5.12.txt
deleted file mode 100644
index 3e08c1598..000000000
--- a/misc/requirements/requirements-pyqt-5.12.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is automatically generated by scripts/dev/recompile_requirements.py
-
-PyQt5==5.12.3  # rq.filter: < 5.13
-PyQt5-sip==12.11.1
-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
deleted file mode 100644
index f127ba42f..000000000
--- a/misc/requirements/requirements-pyqt-5.12.txt-raw
+++ /dev/null
@@ -1,4 +0,0 @@
-#@ filter: PyQt5 < 5.13
-#@ filter: PyQtWebEngine < 5.13
-PyQt5 >= 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
deleted file mode 100644
index ab5965e73..000000000
--- a/misc/requirements/requirements-pyqt-5.13.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is automatically generated by scripts/dev/recompile_requirements.py
-
-PyQt5==5.13.2  # rq.filter: < 5.14
-PyQt5-sip==12.11.1
-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
deleted file mode 100644
index e60db7edb..000000000
--- a/misc/requirements/requirements-pyqt-5.13.txt-raw
+++ /dev/null
@@ -1,4 +0,0 @@
-#@ filter: PyQt5 < 5.14
-#@ filter: PyQtWebEngine < 5.14
-PyQt5 >= 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
deleted file mode 100644
index d7f9af1f9..000000000
--- a/misc/requirements/requirements-pyqt-5.14.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is automatically generated by scripts/dev/recompile_requirements.py
-
-PyQt5==5.14.2  # rq.filter: < 5.15
-PyQt5-sip==12.11.1
-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
deleted file mode 100644
index 9dadfc846..000000000
--- a/misc/requirements/requirements-pyqt-5.14.txt-raw
+++ /dev/null
@@ -1,4 +0,0 @@
-#@ filter: PyQt5 < 5.15
-#@ filter: PyQtWebEngine < 5.15
-PyQt5 >= 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
deleted file mode 100644
index 4022b53af..000000000
--- a/misc/requirements/requirements-pyqt-5.15.0.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# This file is automatically generated by scripts/dev/recompile_requirements.py
-
-PyQt5==5.15.0  # rq.filter: == 5.15.0
-PyQt5-sip==12.11.1
-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
deleted file mode 100644
index 12d6adb7d..000000000
--- a/misc/requirements/requirements-pyqt-5.15.0.txt-raw
+++ /dev/null
@@ -1,4 +0,0 @@
-#@ filter: PyQt5 == 5.15.0
-#@ filter: PyQtWebEngine == 5.15.0
-PyQt5 == 5.15.0
-PyQtWebEngine == 5.15.0
diff --git a/misc/requirements/requirements-pyqt-5.15.2.txt b/misc/requirements/requirements-pyqt-5.15.2.txt
new file mode 100644
index 000000000..986bb42c1
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.15.2.txt
@@ -0,0 +1,5 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt5==5.15.2  # rq.filter: == 5.15.2
+PyQt5-sip==12.10.1
+PyQtWebEngine==5.15.2  # rq.filter: == 5.15.2
diff --git a/misc/requirements/requirements-pyqt-5.15.2.txt-raw b/misc/requirements/requirements-pyqt-5.15.2.txt-raw
new file mode 100644
index 000000000..f8475fd8a
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.15.2.txt-raw
@@ -0,0 +1,4 @@
+#@ filter: PyQt5 == 5.15.2
+#@ filter: PyQtWebEngine == 5.15.2
+PyQt5 == 5.15.2
+PyQtWebEngine == 5.15.2
diff --git a/misc/requirements/requirements-pyqt-5.txt b/misc/requirements/requirements-pyqt-5.txt
new file mode 100644
index 000000000..1641b4fcd
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.txt
@@ -0,0 +1,7 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt5==5.15.6
+PyQt5-Qt5==5.15.2
+PyQt5-sip==12.10.1
+PyQtWebEngine==5.15.5
+PyQtWebEngine-Qt5==5.15.2
diff --git a/misc/requirements/requirements-pyqt-5.txt-raw b/misc/requirements/requirements-pyqt-5.txt-raw
new file mode 100644
index 000000000..9c6afbf16
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-5.txt-raw
@@ -0,0 +1,2 @@
+PyQt5
+PyQtWebEngine
diff --git a/misc/requirements/requirements-pyqt-6.2.txt b/misc/requirements/requirements-pyqt-6.2.txt
new file mode 100644
index 000000000..c41148a06
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-6.2.txt
@@ -0,0 +1,7 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt6==6.2.3
+PyQt6-Qt6==6.2.4
+PyQt6-sip==13.3.1
+PyQt6-WebEngine==6.2.1
+PyQt6-WebEngine-Qt6==6.2.4
diff --git a/misc/requirements/requirements-pyqt-6.2.txt-raw b/misc/requirements/requirements-pyqt-6.2.txt-raw
new file mode 100644
index 000000000..ea182a474
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-6.2.txt-raw
@@ -0,0 +1,4 @@
+PyQt6 >= 6.2, < 6.3
+PyQt6-Qt6 >= 6.2, < 6.3
+PyQt6-WebEngine >= 6.2, < 6.3
+PyQt6-WebEngine-Qt6 >= 6.2, < 6.3
diff --git a/misc/requirements/requirements-pyqt-6.3.txt b/misc/requirements/requirements-pyqt-6.3.txt
new file mode 100644
index 000000000..cdd830e00
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-6.3.txt
@@ -0,0 +1,7 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt6==6.3.1
+PyQt6-Qt6==6.3.1
+PyQt6-sip==13.4.0
+PyQt6-WebEngine==6.3.1
+PyQt6-WebEngine-Qt6==6.3.1
diff --git a/misc/requirements/requirements-pyqt-6.3.txt-raw b/misc/requirements/requirements-pyqt-6.3.txt-raw
new file mode 100644
index 000000000..b4fe4d66e
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-6.3.txt-raw
@@ -0,0 +1,4 @@
+PyQt6 >= 6.3, < 6.4
+PyQt6-Qt6 >= 6.3, < 6.4
+PyQt6-WebEngine >= 6.3, < 6.4
+PyQt6-WebEngine-Qt6 >= 6.3, < 6.4
diff --git a/misc/requirements/requirements-pyqt-6.4.txt b/misc/requirements/requirements-pyqt-6.4.txt
new file mode 100644
index 000000000..91f45c849
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-6.4.txt
@@ -0,0 +1,7 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt6==6.4.0
+PyQt6-Qt6==6.4.1
+PyQt6-sip==13.4.0
+PyQt6-WebEngine==6.4.0
+PyQt6-WebEngine-Qt6==6.4.1
diff --git a/misc/requirements/requirements-pyqt-6.4.txt-raw b/misc/requirements/requirements-pyqt-6.4.txt-raw
new file mode 100644
index 000000000..2de7ab852
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-6.4.txt-raw
@@ -0,0 +1,4 @@
+PyQt6 >= 6.4, < 6.5
+PyQt6-Qt6 >= 6.4, < 6.5
+PyQt6-WebEngine >= 6.4, < 6.5
+PyQt6-WebEngine-Qt6 >= 6.4, < 6.5
diff --git a/misc/requirements/requirements-pyqt-6.txt b/misc/requirements/requirements-pyqt-6.txt
new file mode 100644
index 000000000..cdd830e00
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-6.txt
@@ -0,0 +1,7 @@
+# This file is automatically generated by scripts/dev/recompile_requirements.py
+
+PyQt6==6.3.1
+PyQt6-Qt6==6.3.1
+PyQt6-sip==13.4.0
+PyQt6-WebEngine==6.3.1
+PyQt6-WebEngine-Qt6==6.3.1
diff --git a/misc/requirements/requirements-pyqt-6.txt-raw b/misc/requirements/requirements-pyqt-6.txt-raw
new file mode 100644
index 000000000..68a5db685
--- /dev/null
+++ b/misc/requirements/requirements-pyqt-6.txt-raw
@@ -0,0 +1,4 @@
+PyQt6
+PyQt6-Qt6
+PyQt6-WebEngine
+PyQt6-WebEngine-Qt6
diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw
index ab18a7caa..4c1d32ae7 100644
--- a/misc/requirements/requirements-qutebrowser.txt-raw
+++ b/misc/requirements/requirements-qutebrowser.txt-raw
@@ -2,6 +2,8 @@ Jinja2
 PyYAML
 
 ## Only used on macOS to make borderless windows resizable
+# Not needed anymore with Qt 6.3, but we can't express that
+# here, and it won't hurt either.
 ## our recompile_requirements.py can't really deal with
 ## platform-specific dependencies unfortunately...
 # pyobjc-core