diff options
| -rw-r--r-- | .travis.yml | 5 | ||||
| m--------- | sources/pyside2 | 14 | ||||
| m--------- | sources/shiboken2 | 13 |
3 files changed, 15 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 8b1771273..8429d3aad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,10 +4,11 @@ python: - "2.7" - "3.5" before_install: - - sudo add-apt-repository ppa:beineri/opt-qt551-trusty -y - - sudo apt-get update + - sudo add-apt-repository ppa:beineri/opt-qt551-trusty -y + - sudo apt-get update install: - sudo apt-get install qt55-meta-full -y script: - source /opt/qt55/bin/qt55-env.sh - python setup.py install --jobs=2 --build-tests # --openssl=/path/to/openssl/bin + # how do we separate the build step and the tests, to see both as a result? diff --git a/sources/pyside2 b/sources/pyside2 -Subproject 8b2be7ff2d18815953125f12d4961725f52c41f +Subproject 7006f35459fb41db6f5087217c1cdc0354a3856 diff --git a/sources/shiboken2 b/sources/shiboken2 -Subproject 68f06c122b90308a59b0a980db85613ea00f25f +Subproject d597c044d1938975cda33a0bfeafd6becb9c9ec |