Skip to content

PR: Fix regression in FORCE_QT_API behavior from merging PySide6 support #276

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

Merged
dalthviz merged 3 commits into from Nov 8, 2021
Merged

PR: Fix regression in FORCE_QT_API behavior from merging PySide6 support #276

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4d5968
fix regression in force_qt_qpi
tlambert03 Nov 8, 2021
e60d456
Update qtpy/__init__.py
tlambert03 Nov 8, 2021
2c903ea
Update qtpy/__init__.py
tlambert03 Nov 8, 2021
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
5 changes: 2 additions & 3 deletions qtpy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,8 @@ class PythonQtWarning(Warning):
PYQT5 = True
PYQT6 = PYSIDE2 = PYSIDE6 = False

# When `FORCE_QT_API` is set, we disregard
# any previously imported python bindings.
if 'FORCE_QT_API' in os.environ:
# Unless `FORCE_QT_API` is set, use previously imported Qt Python bindings
if not os.environ.get('FORCE_QT_API'):
if 'PyQt6' in sys.modules:
API = initial_api if initial_api in PYQT6_API else 'pyqt6'
elif 'PyQt5' in sys.modules:
Expand Down