Conditional import of QtWebEngine or QtWebKit

This commit is contained in:
Olivier Keshavjee 2017-06-20 15:24:15 +02:00
parent 28e28e71e5
commit 2beb3a939b
2 changed files with 31 additions and 15 deletions

View file

@ -4,6 +4,7 @@ import faulthandler
import os import os
import sys import sys
import manuskript.ui.views.webView
from PyQt5.QtCore import QLocale, QTranslator, QSettings from PyQt5.QtCore import QLocale, QTranslator, QSettings
from PyQt5.QtGui import QIcon from PyQt5.QtGui import QIcon
from PyQt5.QtWidgets import QApplication, qApp from PyQt5.QtWidgets import QApplication, qApp

View file

@ -1,22 +1,37 @@
#!/usr/bin/env python #!/usr/bin/env python
# --!-- coding: utf8 --!-- # --!-- coding: utf8 --!--
from PyQt5.QtWidgets import QTextEdit import PyQt5
import os
try: features = {'qtwebkit': False, 'qtwebengine': False}
if 'QT_WEB' in os.environ:
features[os.environ['QT_WEB']] = True
else:
try:
import PyQt5.QtWebKitWidgets
features['qtwebkit'] = True
except:
features['qtwebkit'] = False
try:
import PyQt5.QtWebEngineWidgets
features['qtwebengine'] = True
except:
features['qtwebengine'] = False
if features['qtwebkit']:
from PyQt5.QtWebKitWidgets import QWebView from PyQt5.QtWebKitWidgets import QWebView
print("Debug: Web rendering engine used: QWebView") print("Debug: Web rendering engine used: QWebView")
webEngine = "QtWebKit" webEngine = "QtWebKit"
webView = QWebView webView = QWebView
elif features['qtwebengine']:
except: from PyQt5 import QtWebEngineWidgets
print("Debug: Web rendering engine used: QWebEngineView")
try: webEngine = "QtWebEngine"
from PyQt5.QtWebEngineWidgets import QWebEngineView webView = QtWebEngineWidgets.QWebEngineView
print("Debug: Web rendering engine used: QWebEngineView") else:
webEngine = "QtWebEngine" from PyQt5.QtWidgets import QTextEdit
webView = QWebEngineView print("Debug: Web rendering engine used: QTextEdit")
webEngine = "QTextEdit"
except: webView = QTextEdit
print("Debug: Web rendering engine used: QTextEdit")
webEngine = "QTextEdit"
webView = QTextEdit