diff --git a/.travis.yml b/.travis.yml index 471b79871f..32c6344c36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,11 +35,11 @@ matrix: addons: # Install a more recent clang than the default apt: + packages: + - clang-3.8 sources: - ubuntu-toolchain-r-test - llvm-toolchain-precise-3.8 - packages: - - clang-3.8 env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8 - os: osx osx_image: xcode8 @@ -82,6 +82,8 @@ addons: - qt5-default - qt5-qmake - qtbase5-dev-tools + - qtbase5-dev + - qtdeclarative5-dev coverity_scan: project: name: "RetroArch" diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 1746658018..648e5bbc8c 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -284,7 +284,6 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_MOC" = 'yes' ]; then check_pkgconf QT5CONCURRENT Qt5Concurrent 5.2 check_pkgconf QT5NETWORK Qt5Network 5.2 #check_pkgconf QT5WEBENGINE Qt5WebEngine 5.4 - check_pkgconf OPENSSL openssl 1.0.0 # pkg-config is needed to reliably find Qt5 libraries. @@ -295,6 +294,8 @@ if [ "$HAVE_QT" != 'no' ] && [ "$HAVE_MOC" = 'yes' ]; then HAVE_QT=yes fi + check_pkgconf OPENSSL openssl 1.0.0 + #if [ "$HAVE_QT5WEBENGINE" = "no" ]; then # die : 'Notice: Qt5WebEngine not found, disabling web browser support.' #fi