linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support PyQt5 (fallback to PyQt4)

Browse Source 
Change-Id: I7fa1add00d677e626fee5cd1071dee54d0bf8565
Reviewed-on: https://forge.frm2.tum.de/review/17666
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber
2018-04-11 11:10:22 +02:00
parent 40e75aefcc
commit e830666315
9 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/secop-gui
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python
# pylint: disable=invalid-name
# -*- coding: utf-8 -*-
# *****************************************************************************
# Copyright (c) 2015-2016 by the authors, see LICENSE
@ -27,15 +28,13 @@ from __future__ import print_function
import sys
from os import path
# Add import path for inplace usage
sys.path.insert(0, path.abspath(path.join(path.dirname(__file__), '..')))
from secop.gui.mainwindow import MainWindow
import mlzlog
from PyQt4.QtGui import QApplication
from secop.gui.qt import QApplication
from secop.gui.mainwindow import MainWindow
def main(argv=None):
@ -67,4 +66,3 @@ def main(argv=None):
if __name__ == '__main__':
sys.exit(main(sys.argv))