From 3c839dd6e4fe1cb0d5b6708773637ec5230ffd2d Mon Sep 17 00:00:00 2001
From: inso <insomniak.fr@gmaiL.com>
Date: Fri, 7 Apr 2017 01:11:55 +0200
Subject: [PATCH] Build with qt 5.8
---
ci/travis/before_install.sh | 6 +++---
ci/travis/build.sh | 2 +-
ci/travis/qt-installer-noninteractive.qs | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ci/travis/before_install.sh b/ci/travis/before_install.sh
index bacf6028..0d9dc770 100755
--- a/ci/travis/before_install.sh
+++ b/ci/travis/before_install.sh
@@ -28,9 +28,9 @@ then
libxcb-render-util0-dev libxcb-glx0-dev libgl1-mesa-dri libegl1-mesa libpcre3 libgles2-mesa-dev \
freeglut3-dev libfreetype6-dev xorg-dev xserver-xorg-input-void xserver-xorg-video-dummy xpra libosmesa6-dev \
curl libdbus-1-dev libdbus-glib-1-dev autoconf automake libtool libgstreamer-plugins-base0.10-0 dunst
- wget https://download.qt.io/official_releases/qt/5.7/5.7.1/qt-opensource-linux-x64-5.7.1.run
- chmod +x qt-opensource-linux-x64-5.7.1.run
- ./qt-opensource-linux-x64-5.7.1.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
+ wget https://download.qt.io/official_releases/qt/5.8/5.8.0/qt-opensource-linux-x64-5.8.0.run
+ chmod +x qt-opensource-linux-x64-5.8.0.run
+ ./qt-opensource-linux-x64-5.8.0.run --script $HOME/build/duniter/sakia/ci/travis/qt-installer-noninteractive.qs
wget http://archive.ubuntu.com/ubuntu/pool/universe/libs/libsodium/libsodium13_1.0.1-1_amd64.deb
sudo dpkg -i libsodium13_1.0.1-1_amd64.deb
diff --git a/ci/travis/build.sh b/ci/travis/build.sh
index 15ccefe2..0cec2f7c 100755
--- a/ci/travis/build.sh
+++ b/ci/travis/build.sh
@@ -17,7 +17,7 @@ then
pip install -U git+https://github.com/posborne/dbus-python.git
pip install notify2
- export PATH=/tmp/qt/5.7/5.7/gcc_64/bin:$PATH
+ export PATH=/tmp/qt/5.8/5.8/gcc_64/bin:$PATH
fi
if [ $TRAVIS_OS_NAME == "osx" ]
then
diff --git a/ci/travis/qt-installer-noninteractive.qs b/ci/travis/qt-installer-noninteractive.qs
index be376cd7..1e943f44 100644
--- a/ci/travis/qt-installer-noninteractive.qs
+++ b/ci/travis/qt-installer-noninteractive.qs
@@ -21,7 +21,7 @@ Controller.prototype.IntroductionPageCallback = function() {
Controller.prototype.TargetDirectoryPageCallback = function()
{
- gui.currentPageWidget().TargetDirectoryLineEdit.setText("/tmp/qt/5.7");
+ gui.currentPageWidget().TargetDirectoryLineEdit.setText("/tmp/qt/5.8");
gui.clickButton(buttons.NextButton);
}
--
GitLab