merge with pyqt5 branch and video sending
This commit is contained in:
parent
f8a7087779
commit
d0e2f61d03
24 changed files with 681 additions and 805 deletions
|
@ -1,7 +1,7 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
|
||||
try:
|
||||
from PySide import QtCore
|
||||
from PyQt5 import QtCore
|
||||
except ImportError:
|
||||
from PyQt4 import QtCore
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue