Fix make earlyinit and version PyQt version independant

These require a bit of special casing due to how they handle imports.

2 files changed, 26 insertions, 20 deletions

diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py
index 2facbfaab..e28550998 100644
--- a/qutebrowser/utils/qtutils.py
+++ b/qutebrowser/utils/qtutils.py
@@ -35,17 +35,18 @@ import operator
 import contextlib
 from typing import (Any, AnyStr, TYPE_CHECKING, BinaryIO, IO, Iterator,
                     Optional, Union, Tuple, cast)
-try:
-    from qutebrowser.qt.webkit import qWebKitVersion
-except ImportError:  # pragma: no cover
-    qWebKitVersion = None  # type: ignore[assignment]  # noqa: N816
 if TYPE_CHECKING:
-    from qutebrowser.qt import QWebHistory
-    from qutebrowser.qt import QWebEngineHistory
+    from qutebrowser.qt import webenginecore
 
 from qutebrowser.misc import objects
 from qutebrowser.utils import usertypes, utils
-from qutebrowser.qt import core, gui
+from qutebrowser.qt import core, gui, webkit
+
+
+if webkit:
+    qWebKitVersion = webkit.qWebKitVersion
+else:
+    qWebKitVersion = lambda: None  # type: ignore[assignment]  # noqa: N816
 
 
 MAXVALS = {
@@ -186,8 +187,8 @@ _QtSerializableType = Union[
     core.QObject,
     core.QByteArray,
     core.QUrl,
-    'QWebEngineHistory',
-    'QWebHistory'
+    'webenginecore.QWebEngineHistory',
+    'webkit.QWebHistory'
 ]
 
 
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py
index 42215633e..992e29982 100644
--- a/qutebrowser/utils/version.py
+++ b/qutebrowser/utils/version.py
@@ -36,17 +36,7 @@ import dataclasses
 from typing import (Mapping, Optional, Sequence, Tuple, ClassVar, Dict, cast,
                     TYPE_CHECKING)
 
-from qutebrowser.qt import opengl, widgets, network, gui, core, machinery
-
-try:
-    from qutebrowser.qt.webkit import qWebKitVersion
-except ImportError:  # pragma: no cover
-    qWebKitVersion = lambda: None  # type: ignore[assignment]  # noqa: N816
-try:
-    from qutebrowser.qt.webenginecore import PYQT_WEBENGINE_VERSION_STR
-except ImportError:
-    # QtWebKit
-    PYQT_WEBENGINE_VERSION_STR = None  # type: ignore[assignment]
+from qutebrowser.qt import opengl, widgets, webenginecore, webkit, network, gui, core, machinery
 
 
 import qutebrowser
@@ -55,9 +45,24 @@ from qutebrowser.utils import (log, utils, standarddir, usertypes, message, reso
 from qutebrowser.misc import objects, earlyinit, sql, httpclient, pastebin, elf
 from qutebrowser.browser import pdfjs
 from qutebrowser.config import config
+
+
 if TYPE_CHECKING:
     from qutebrowser.config import websettings
 
+
+if webkit:
+    qWebKitVersion = webkit.qWebKitVersion
+else:
+    qWebKitVersion = lambda: None  # type: ignore[assignment]  # noqa: N816
+
+
+if webenginecore:
+    PYQT_WEBENGINE_VERSION_STR = webenginecore.PYQT_WEBENGINE_VERSION_STR
+else:
+    PYQT_WEBENGINE_VERSION_STR = None  # type: ignore[assignment]
+
+
 _LOGO = r'''
          ______     ,,
     ,.-"`      | ,-` |