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
|
|
@ -2,10 +2,7 @@ import util
|
|||
import json
|
||||
import os
|
||||
from collections import OrderedDict
|
||||
try:
|
||||
from PySide import QtCore
|
||||
except ImportError:
|
||||
from PyQt4 import QtCore
|
||||
from PyQt5 import QtCore
|
||||
|
||||
|
||||
class SmileyLoader(util.Singleton):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue