From f269426df9256060b104c35c98716d1bf836eb83 Mon Sep 17 00:00:00 2001 From: "iquadtree@users.noreply.github.com" Date: Mon, 25 Nov 2019 20:36:03 +0700 Subject: [PATCH] CI build fix #2 --- .travis.yml | 5 +++-- README.md | 4 +--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 734087e..8833552 100644 --- 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 index 666e801..930b961 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ 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 @@ -23,8 +23,6 @@ $ autoreconf -i $ ./configure $ make $ popd -$ qbs setup-toolchains --detect -$ qbs config defaultProfile gcc $ qbs build ```