From 368d90f55863c82789f5a83ff3c0454e35d1a804 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 30 Dec 2014 23:10:41 +0100 Subject: [PATCH 1/4] Test building qt5 on canonical-qt5-edgers/qt5-beta-proper --- travis-dependencies.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 5878b513b..44456fd34 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -12,10 +12,10 @@ else sudo apt-get update -qq sudo apt-get install -y qtmobility-dev libprotobuf-dev protobuf-compiler libqt4-dev else - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa + sudo add-apt-repository --yes ppa:canonical-qt5-edgers/qt5-beta-proper sudo apt-get update -qq sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\ qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools\ qttools5-dev qtmultimedia5-dev libqt5svg5-dev fi -fi +fi \ No newline at end of file From 02e9475f5a2f2fc3439a4c07f3d811f33b543393 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 30 Dec 2014 23:14:05 +0100 Subject: [PATCH 2/4] test, round #2 --- travis-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 44456fd34..13fb9fd8f 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -16,6 +16,6 @@ else sudo apt-get update -qq sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\ qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools\ - qttools5-dev qtmultimedia5-dev libqt5svg5-dev + qttools5-dev libqt5svg5-dev fi fi \ No newline at end of file From 977fb4c99c8c166b296d30addb1826aa52608b3b Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 30 Dec 2014 23:27:57 +0100 Subject: [PATCH 3/4] adding libqt5-whatever-but-not-this-dependency-hell --- travis-dependencies.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 13fb9fd8f..9d275d81d 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -16,6 +16,8 @@ else sudo apt-get update -qq sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\ qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools\ - qttools5-dev libqt5svg5-dev + qttools5-dev libqt5svg5-dev libqt5svg5 qtbase5-dev libqt5gui5 libqt5printsupport5 \ + libqt5widgets5 qt5-qmake qtbase5-dev-tools qtchooser libqt5quick5 libqt5quickparticles5 \ + libqt5quicktest5 libqt5designer5 libqt5designercomponents5 libqt5gui5 libqt5help5 fi fi \ No newline at end of file From 4d9da5232b51663861ec3074de61a9ef8be70130 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 30 Dec 2014 23:32:19 +0100 Subject: [PATCH 4/4] happy new mess --- travis-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis-dependencies.sh b/travis-dependencies.sh index 9d275d81d..10f3af087 100755 --- a/travis-dependencies.sh +++ b/travis-dependencies.sh @@ -17,7 +17,7 @@ else sudo apt-get install -y libprotobuf-dev protobuf-compiler qtbase5-dev cmake\ qtdeclarative5-dev libqt5webkit5-dev libsqlite3-dev qt5-default qttools5-dev-tools\ qttools5-dev libqt5svg5-dev libqt5svg5 qtbase5-dev libqt5gui5 libqt5printsupport5 \ - libqt5widgets5 qt5-qmake qtbase5-dev-tools qtchooser libqt5quick5 libqt5quickparticles5 \ + libqt5widgets5 qt5-qmake qtbase5-dev-tools libqt5quick5 libqt5quickparticles5 \ libqt5quicktest5 libqt5designer5 libqt5designercomponents5 libqt5gui5 libqt5help5 fi fi \ No newline at end of file