Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add constant to QtWebEngineWidgets to see if we are using WebEngine or WebKit #24

Merged
merged 1 commit into from
Jun 2, 2016
Merged

Add constant to QtWebEngineWidgets to see if we are using WebEngine or WebKit #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion qtpy/QtWebEngineWidgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
from qtpy import PythonQtError


# To test if we are using WebEngine or WebKit
WEBENGINE = True


if os.environ[QT_API] in PYQT5_API:
try:
from PyQt5.QtWebEngineWidgets import QWebEnginePage
Expand All @@ -27,14 +31,17 @@
except ImportError:
from PyQt5.QtWebKitWidgets import QWebPage as QWebEnginePage
from PyQt5.QtWebKitWidgets import QWebView as QWebEngineView
from PyQt5.QtWebKit import QWebSettings as QWebEngineSettings
from PyQt5.QtWebKit import QWebSettings as QWebEngineSettings
WEBENGINE = False
elif os.environ[QT_API] in PYQT4_API:
from PyQt4.QtWebKit import QWebPage as QWebEnginePage
from PyQt4.QtWebKit import QWebView as QWebEngineView
from PyQt4.QtWebKit import QWebSettings as QWebEngineSettings
WEBENGINE = False
elif os.environ[QT_API] in PYSIDE_API:
from PySide.QtWebKit import QWebPage as QWebEnginePage
from PySide.QtWebKit import QWebView as QWebEngineView
from PySide.QtWebKit import QWebSettings as QWebEngineSettings
WEBENGINE = False
else:
raise PythonQtError('No Qt bindings could be found')