piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

For Travis ...

Browse Source
This commit is contained in:
Bertrand Songis
2015-10-25 14:37:28 +01:00
parent 543123a169
commit 0e34c24d96
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+1 -1
View File
@@ -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
radio/src/Makefile
+1 -1
View File
@@ -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)
radio/util/font2png.py
+1 -5
View File
@@ -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)