From 0e9f5e7e4fc071f67fcc877031af7ef7c543caa1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Tue, 27 Jun 2023 21:04:22 +0200
Subject: scripts: Upgrade to Qt 6

Using qutebrowser.qt where we import from qutebrowser already anyways
---
 scripts/dev/misc_checks.py          | 1 -
 scripts/dev/standardpaths_tester.py | 2 +-
 scripts/keytester.py                | 3 +--
 scripts/opengl_info.py              | 6 +++---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/scripts/dev/misc_checks.py b/scripts/dev/misc_checks.py
index 240b5e6f1..db4137dff 100644
--- a/scripts/dev/misc_checks.py
+++ b/scripts/dev/misc_checks.py
@@ -291,7 +291,6 @@ def check_pyqt_imports(args: argparse.Namespace) -> Optional[bool]:
     """Check for direct PyQt imports."""
     ignored = [
         pathlib.Path("qutebrowser", "qt"),
-        # FIXME:qt6 fix those too?
         pathlib.Path("misc", "userscripts"),
         pathlib.Path("scripts"),
     ]
diff --git a/scripts/dev/standardpaths_tester.py b/scripts/dev/standardpaths_tester.py
index ff85b2a4c..bbd0a39fb 100644
--- a/scripts/dev/standardpaths_tester.py
+++ b/scripts/dev/standardpaths_tester.py
@@ -21,7 +21,7 @@
 import os
 import sys
 
-from PyQt5.QtCore import (QT_VERSION_STR, PYQT_VERSION_STR, qVersion,
+from PyQt6.QtCore import (QT_VERSION_STR, PYQT_VERSION_STR, qVersion,
                           QStandardPaths, QCoreApplication)
 
 
diff --git a/scripts/keytester.py b/scripts/keytester.py
index 6d994114d..861133c06 100644
--- a/scripts/keytester.py
+++ b/scripts/keytester.py
@@ -21,8 +21,7 @@
 Use python3 -m scripts.keytester to launch it.
 """
 
-from PyQt5.QtWidgets import QApplication
-
+from qutebrowser.qt.widgets import QApplication
 from qutebrowser.misc import miscwidgets
 
 app = QApplication([])
diff --git a/scripts/opengl_info.py b/scripts/opengl_info.py
index 5dc8f81c6..7c5ede6e7 100644
--- a/scripts/opengl_info.py
+++ b/scripts/opengl_info.py
@@ -18,8 +18,8 @@
 
 """Show information about the OpenGL setup."""
 
-from PyQt5.QtGui import (QOpenGLContext, QOpenGLVersionProfile,
-                         QOffscreenSurface, QGuiApplication)
+from PyQt6.QtGui import QOpenGLContext, QOffscreenSurface, QGuiApplication
+from PyQt6.QtOpenGL import QOpenGLVersionProfile, QOpenGLVersionFunctionsFactory
 
 app = QGuiApplication([])
 
@@ -38,7 +38,7 @@ print(f"GLES: {ctx.isOpenGLES()}")
 vp = QOpenGLVersionProfile()
 vp.setVersion(2, 0)
 
-vf = ctx.versionFunctions(vp)
+vf = QOpenGLVersionFunctionsFactory.get(vp, ctx)
 print(f"Vendor: {vf.glGetString(vf.GL_VENDOR)}")
 print(f"Renderer: {vf.glGetString(vf.GL_RENDERER)}")
 print(f"Version: {vf.glGetString(vf.GL_VERSION)}")
-- 
cgit v1.2.3-54-g00ecf