From cb7b2a07d8c5dfc35f41bb6782ff291300746d48 Mon Sep 17 00:00:00 2001 From: Alejandro Martinez Date: Tue, 14 Jun 2022 15:36:17 -0300 Subject: [PATCH] Upgrade Qt to 5.15.2 for Linux builds on Travis-ci [skip AppVeyor] --- travis/linux/after_success.sh | 4 ++-- travis/linux/before_install.sh | 8 ++++---- travis/linux/before_script.sh | 2 +- travis/linux/script.sh | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/travis/linux/after_success.sh b/travis/linux/after_success.sh index 094ee5be3..9b8c5f579 100755 --- a/travis/linux/after_success.sh +++ b/travis/linux/after_success.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ev -export PATH=/opt/qt514/bin:$PATH -export LD_LIBRARY_PATH=/opt/qt514/lib/x86_64-linux-gnu:/opt/qt514/lib:$LD_LIBRARY_PATH +export PATH=/opt/qt515/bin:$PATH +export LD_LIBRARY_PATH=/opt/qt515/lib/x86_64-linux-gnu:/opt/qt515/lib:$LD_LIBRARY_PATH ### This script should be run from GoldenCheetah src directory after build cd src diff --git a/travis/linux/before_install.sh b/travis/linux/before_install.sh index 742d1068c..eca87f31a 100755 --- a/travis/linux/before_install.sh +++ b/travis/linux/before_install.sh @@ -2,11 +2,11 @@ set -ev # Add recent Qt dependency ppa, update on a newer qt version. -sudo add-apt-repository -y ppa:beineri/opt-qt-5.14.2-bionic +sudo add-apt-repository -y ppa:beineri/opt-qt-5.15.2-bionic sudo apt-get update -qq -sudo apt-get install -qq qt5-default qt514base qt514tools qt514serialport\ - qt514svg qt514multimedia qt514connectivity qt514webengine qt514charts-no-lgpl\ - qt514networkauth-no-lgpl qt514translations +sudo apt-get install -qq qt5-default qt515base qt515tools qt515serialport\ + qt515svg qt515multimedia qt515connectivity qt515webengine qt515charts-no-lgpl\ + qt515networkauth-no-lgpl qt515translations sudo apt-get install -qq libglu1-mesa-dev sudo apt-get install -qq libsamplerate0-dev diff --git a/travis/linux/before_script.sh b/travis/linux/before_script.sh index 70393b02e..292dc712e 100755 --- a/travis/linux/before_script.sh +++ b/travis/linux/before_script.sh @@ -1,6 +1,6 @@ #!/bin/bash set -ev -export PATH=/opt/qt514/bin:$PATH +export PATH=/opt/qt515/bin:$PATH cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri diff --git a/travis/linux/script.sh b/travis/linux/script.sh index d218837c9..3379a26e7 100755 --- a/travis/linux/script.sh +++ b/travis/linux/script.sh @@ -1,6 +1,6 @@ #!/bin/bash set -ev -export PATH=/opt/qt514/bin:$PATH +export PATH=/opt/qt515/bin:$PATH qmake -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-deprecated-declarations -Wno-unused-value" QMAKE_CFLAGS_WARN_ON+="-Wno-deprecated-declarations -Wno-unused-value" make -j4 exit