Skip to content

Commit 20e3fa3

Browse files
authored
Merge pull request #228 from dalthviz/fixes_issue_227
PR: Change constants used to validate `PySide` installation and update `PySide2` test environment to use `QtPy`<2.0.0
2 parents 1623f2a + dc2dfbe commit 20e3fa3

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ build
1010
# Projects
1111
.pydevproject
1212
.project
13+
.spyproject
1314

1415
# Sphinx
1516
_build/

qtawesome/iconic_font.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import warnings
2323

2424
# Third party imports
25-
from qtpy import PYSIDE2, PYSIDE6
25+
from qtpy import PYSIDE_VERSION
2626
from qtpy.QtCore import (QObject, QPoint, QRect, Qt,
2727
QSizeF, QRectF, QPointF, QThread)
2828
from qtpy.QtGui import (QColor, QFont, QFontDatabase, QIcon, QIconEngine,
@@ -532,7 +532,7 @@ def rawfont(self, prefix, size, hintingPreference=QFont.PreferDefaultHinting):
532532
# (either using a constructor, or by calling loadFromData() or loadFromFile()).
533533
# The QRawFont cannot be moved to a different thread,
534534
# but will have to be recreated in the thread in question.
535-
if PYSIDE2 or PYSIDE6:
535+
if PYSIDE_VERSION:
536536
# Needed since PySide* bindings don't expose QThread.currentThreadId
537537
tid = str(QThread.currentThread())
538538
else:

requirements/environment_tests_pyside2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ dependencies:
66
- pytest
77
- pytest-cov
88
- pytest-qt
9-
- qtpy
9+
- qtpy<2.0.0

0 commit comments

Comments
 (0)