rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reorganize earlyinit checks

Browse Source 
We first do all checks we can without knowing the backend, before getting that.
This is because we need to do some more stuff in get_backend now.
This commit is contained in:
Florian Bruhin 2017-04-13 15:48:46 +02:00
parent bec8299b2e
commit d0461eece3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qutebrowser/misc/earlyinit.py
View File

@ -322,8 +322,7 @@ def check_libraries(backend):
if backend == 'webengine': if backend == 'webengine':
modules['PyQt5.QtWebEngineWidgets'] = _missing_str("QtWebEngine", modules['PyQt5.QtWebEngineWidgets'] = _missing_str("QtWebEngine",
webengine=True) webengine=True)
else: elif backend == 'webkit':
assert backend == 'webkit'
modules['PyQt5.QtWebKit'] = _missing_str("PyQt5.QtWebKit") modules['PyQt5.QtWebKit'] = _missing_str("PyQt5.QtWebKit")
modules['PyQt5.QtWebKitWidgets'] = _missing_str( modules['PyQt5.QtWebKitWidgets'] = _missing_str(
"PyQt5.QtWebKitWidgets") "PyQt5.QtWebKitWidgets")
@ -407,10 +406,15 @@ def earlyinit(args):
fix_harfbuzz(args) fix_harfbuzz(args)
# Now we can be sure QtCore is available, so we can print dialogs on # Now we can be sure QtCore is available, so we can print dialogs on
# errors, so people only using the GUI notice them as well. # errors, so people only using the GUI notice them as well.
backend = get_backend(args) #
check_qt_version(backend) # First do some early version checks, without knowing the backend.
check_qt_version(None)
remove_inputhook() remove_inputhook()
check_libraries(backend) check_libraries(None)
check_ssl_support() check_ssl_support()
check_optimize_flag() check_optimize_flag()
# Now find out the backend to use, and do the rest of the checks
backend = get_backend(args)
check_qt_version(backend)
check_libraries(backend)
set_backend(backend) set_backend(backend)