amass/qtpromise
1
0
Fork 0
mirror of https://github.com/simonbrunel/qtpromise.git synced 2024-11-22 10:40:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade TravisCI environment to Qt 5.6 and GCC 4.9

Browse Source
This commit is contained in:
Peter Würtz 2018-05-17 21:57:07 +02:00 committed by Simon Brunel
parent 26a2110a14
commit efb6001b9d
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -4,12 +4,15 @@ language: cpp
compiler: gcc compiler: gcc
before_install: before_install:
- sudo add-apt-repository -y ppa:beineri/opt-qt542-trusty - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo add-apt-repository -y ppa:beineri/opt-qt563-trusty
- sudo apt-get update -qq - sudo apt-get update -qq
install: install:
- sudo apt-get install -qq qt54base - sudo apt-get install -qq gcc-4.9 g++-4.9
- source /opt/qt54/bin/qt54-env.sh - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
- sudo apt-get install -qq qt56base
- source /opt/qt56/bin/qt56-env.sh
- wget http://archive.ubuntu.com/ubuntu/pool/universe/l/lcov/lcov_1.13.orig.tar.gz - wget http://archive.ubuntu.com/ubuntu/pool/universe/l/lcov/lcov_1.13.orig.tar.gz
- tar xf lcov_1.13.orig.tar.gz - tar xf lcov_1.13.orig.tar.gz
- cd lcov-1.13/ - cd lcov-1.13/
@ -19,7 +22,7 @@ install:
before_script: before_script:
- qmake --version - qmake --version
- lcov --version - lcov --version
- gcc --version - gcc --version && g++ --version
script: script:
- qmake qtpromise.pro CONFIG+=coverage - qmake qtpromise.pro CONFIG+=coverage

2
README.md
View File

@ -5,7 +5,7 @@
[Promises/A+](https://promisesaplus.com/) implementation for [Qt/C++](https://www.qt.io/). [Promises/A+](https://promisesaplus.com/) implementation for [Qt/C++](https://www.qt.io/).
Requires [Qt 5.4](https://www.qt.io/download/) (or later) with [C++11 support enabled](https://wiki.qt.io/How_to_use_C++11_in_your_Qt_Projects). Requires [Qt 5.6](https://www.qt.io/download/) (or later) with [C++11 support enabled](https://wiki.qt.io/How_to_use_C++11_in_your_Qt_Projects).
## Documentation ## Documentation

2
docs/README.md
View File

@ -3,7 +3,7 @@
# QtPromise # QtPromise
[Promises/A+](https://promisesaplus.com/) implementation for [Qt/C++](https://www.qt.io/). [Promises/A+](https://promisesaplus.com/) implementation for [Qt/C++](https://www.qt.io/).
Requires [Qt 5.4](https://www.qt.io/download/) (or later) with [C++11 support enabled](https://wiki.qt.io/How_to_use_C++11_in_your_Qt_Projects). Requires [Qt 5.6](https://www.qt.io/download/) (or later) with [C++11 support enabled](https://wiki.qt.io/How_to_use_C++11_in_your_Qt_Projects).
## QtPromise for C++ ## QtPromise for C++
* [Getting Started](qtpromise/getting-started.md) * [Getting Started](qtpromise/getting-started.md)