diff --git a/.travis.yml b/.travis.yml index f0d5e8c..ae9175b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,20 @@ language: cpp -os: - - linux +os: linux dist: trusty -compiler: - - gcc - -cache: - directories: - - qt5 +compiler: gcc before_script: - - if [ ! -d qt5 ] ; then source make_qt.sh ; fi + - git clone --branch=5.10 git://code.qt.io/qt/qt5.git + - pushd qt5 + - perl init-repository --module-subset=qtbase,qtimageformats + - ./configure -opensource -nomake examples -nomake tests -confirm-license + - make -j2 + - sudo make install + - popd script: - - which qmake - - which lrelease - mkdir -p build - pushd build - - qmake .. -config release + - ../qt5/qtbase/bin/qmake .. -config release - make -j2 - popd \ No newline at end of file diff --git a/make_qt.sh b/make_qt.sh deleted file mode 100644 index 9769b82..0000000 --- a/make_qt.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash0 -git clone --branch=5.10 git://code.qt.io/qt/qt5.git -pushd qt5 -perl init-repository --module-subset=qtbase,qtimageformats -./configure -static -opensource -nomake examples -nomake tests -confirm-license -make -j2 -sudo make install -popd \ No newline at end of file