merge with pyqt5 branch and video sending

2017-06-11 15:35:52 +03:00
parent f8a7087779
commit d0e2f61d03
24 changed files with 681 additions and 805 deletions
--- a/toxygen/updater.py
+++ b/toxygen/updater.py
@@ -3,10 +3,7 @@ import os
 import settings
 import platform
 import urllib
-try:
-    from PySide import QtNetwork, QtCore
-except ImportError:
-    from PyQt4 import QtNetwork, QtCore
+from PyQt5 import QtNetwork, QtCore
 import subprocess