diff --git a/.travis.yml b/.travis.yml index 5ed6a1991..4b5ca6a54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ before_install: - sudo apt-get update install: - - sudo apt-get install -y lcov cmake cmake-data bc curl gcc-arm-none-eabi gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev + - sudo apt-get install -y xvfb lcov cmake cmake-data bc curl gcc-arm-none-eabi gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev script: - radio/util/commit-tests.sh diff --git a/radio/src/Makefile b/radio/src/Makefile index 515715e7d..0640d8ac4 100644 --- a/radio/src/Makefile +++ b/radio/src/Makefile @@ -393,7 +393,7 @@ endif IMG2LBM = -$(PYTHON) ../util/img2lbm.py BIN2LBM = -$(PYTHON) ../util/bin2lbm.py -FONT2PNG = -$(PYTHON) ../util/font2png.py +FONT2PNG = -xvfb-run $(PYTHON) ../util/font2png.py TRANSLATE = -$(PYTHON) ../util/translate.py VERSION = 2.2.0$(OPENTX_VERSION_SUFFIX) diff --git a/radio/util/font2png.py b/radio/util/font2png.py index 924b42b45..f9f5a3f20 100755 --- a/radio/util/font2png.py +++ b/radio/util/font2png.py @@ -5,11 +5,7 @@ import sys from PyQt4 import Qt, QtCore, QtGui import glob -try: - app = Qt.QCoreApplication(sys.argv) -except: - pass - # app = Qt.QCoreApplication(sys.argv) +app = Qt.QApplication(sys.argv) for f in glob.glob("fonts/*.ttf"): QtGui.QFontDatabase.addApplicationFont(f)