diff --git a/.travis.yml b/.travis.yml index 44e9a40..e497406 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,8 @@ before_install: - which pip - curl -L https://bintray.com/alby128/Syncplay/download_file?file_path=PySide2-5.6.0a1-5.6.1-cp27-cp27m-macosx_10_11_x86_64.whl -o PySide2-5.6.0a1-5.6.1-cp27-cp27m-macosx_10_11_x86_64.whl - pip install PySide2-5.6.0a1-5.6.1-cp27-cp27m-macosx_10_11_x86_64.whl -- ln -s /usr/local/lib/python2.7/site-packages/PySide2/libshiboken2-python2.7v.2.0.0.dylib /usr/local/lib/ -- ln -s /usr/local/lib/python2.7/site-packages/PySide2/libshiboken2-python2.7v.2.0.dylib /usr/local/lib/ -- ln -s /usr/local/lib/python2.7/site-packages/PySide2/libshiboken2-python2.7v.dylib /usr/local/lib/ -- ln -s /usr/local/lib/python2.7/site-packages/PySide2/libpyside2-python2.7v.2.0.0.dylib /usr/local/lib/ -- ln -s /usr/local/lib/python2.7/site-packages/PySide2/libpyside2-python2.7v.2.0.dylib /usr/local/lib/ -- ln -s /usr/local/lib/python2.7/site-packages/PySide2/libpyside2-python2.7v.dylib /usr/local/lib/ +- ln -s /usr/local/lib/python2.7/site-packages/PySide2/libshiboken2-python2.7v.5.6.dylib /usr/local/lib/ +- ln -s /usr/local/lib/python2.7/site-packages/PySide2/libpyside2-python2.7v.5.6.dylib /usr/local/lib/ #- python -c "from PySide2 import QtCore" - python -c "from PySide2.QtCore import __version__; print __version__" - hg clone https://alby128@bitbucket.org/alby128/py2app diff --git a/syncplay/ui/ConfigurationGetter.py b/syncplay/ui/ConfigurationGetter.py index d1bbe81..72cd879 100755 --- a/syncplay/ui/ConfigurationGetter.py +++ b/syncplay/ui/ConfigurationGetter.py @@ -467,17 +467,17 @@ class ConfigurationGetter(object): self._overrideConfigWithArgs(args) if not self._config['noGui']: try: - from syncplay.vendor.Qt import QtWidgets, IsPySide, IsPySide2 - from syncplay.vendor.Qt.QtCore import QCoreApplication - from syncplay.vendor import qt5reactor - if not (IsPySide2 or IsPySide): - raise ImportError - if QCoreApplication.instance() is None: - self.app = QtWidgets.QApplication(sys.argv) - qt5reactor.install() - if isMacOS(): - import appnope - appnope.nope() + from syncplay.vendor.Qt import QtWidgets, IsPySide, IsPySide2 + from syncplay.vendor.Qt.QtCore import QCoreApplication + from syncplay.vendor import qt5reactor + if not (IsPySide2 or IsPySide): + raise ImportError + if QCoreApplication.instance() is None: + self.app = QtWidgets.QApplication(sys.argv) + qt5reactor.install() + if isMacOS(): + import appnope + appnope.nope() except ImportError: print getMessage("unable-import-gui-error") self._config['noGui'] = True