CI build fix shi-yan#2

iquadtree · Nov 25, 2019 · f269426 · f269426
1 parent 835f80d
commit f269426
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 before_install:
     - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa
     - sudo apt-get update -qq
-    - sudo apt-get install -qq qbs qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev
+    - sudo apt-get install -qq qbs qt5-qmake qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev
 
 script:
   - git submodule init
@@ -13,5 +13,6 @@ script:
   - popd
   - qbs --version
   - qbs setup-toolchains --detect
-  - qbs config defaultProfile gcc
+  - qbs setup-qt /usr/bin/qmake qt5
+  - qbs config defaultProfile qt5
   - qbs build
diff --git a/README.md b/README.md
@@ -15,16 +15,14 @@ While working on a video decoding project, I found that video decoders are very
 For more options, see:
 [h264 frame viewer question on Stackoverflow](http://stackoverflow.com/questions/6014904/h264-frame-viewer)
 
-Building from sources:
+Building from sources (Qbs should be configured first, please take look at [the Qbs setup manual](https://doc.qt.io/qbs/setup.html)):
 
 ```sh
 $ pushd deps/h264bitstream
 $ autoreconf -i
 $ ./configure
 $ make
 $ popd
-$ qbs setup-toolchains --detect
-$ qbs config defaultProfile gcc
 $ qbs build
 ```