python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-03 20:10:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 2a3422335b into b47cecfe9f

Browse Source
This commit is contained in:
Aurélien Ballier 2013-11-20 20:27:15 -08:00
commit 9d33f00eff
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PIL/ImageQt.py
View File

@ -8,6 +8,7 @@
# 2006-06-03 fl: created
# 2006-06-04 fl: inherit from QImage instead of wrapping it
# 2006-06-05 fl: removed toimage helper; move string support to ImageQt
# 2013-11-13 fl: add support for Qt5 (aurelien.ballier@cyclonit.com)
#
# Copyright (c) 2006 by Secret Labs AB
# Copyright (c) 2006 by Fredrik Lundh
@ -18,7 +19,10 @@
from PIL import Image
from PIL._util import isPath
from PyQt4.QtGui import QImage, qRgb
try:
from PyQt5.QtGui import QImage, qRgb
except:
from PyQt4.QtGui import QImage, qRgb
##
# (Internal) Turns an RGB color into a Qt compatible color integer.