From a5199b54ba9af5942abe84150ab7dabb8281894e Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 27 Apr 2017 15:43:16 +0100 Subject: [PATCH] Add Qt5 svg package to linux setup --- CONTRIBUTING.md | 4 ++-- scripts/travis/linux_setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8fbc9b340..f318033f4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -110,7 +110,7 @@ On Windows there are no dependencies - you can always compile the latest version Requirements for the core library and renderdoccmd are libx11, libxcb, libxcb-keysyms and libGL. The exact are packages for these vary by distribution. -For qrenderdoc you need Qt5 >= 5.6 along with the 'x11extras' package. You also need python3-dev for the python integration, and bison, autoconf, automake and libpcre3-dev for building the custom SWIG tool for generating bindings. +For qrenderdoc you need Qt5 >= 5.6 along with the 'svg' and 'x11extras' packages. You also need python3-dev for the python integration, and bison, autoconf, automake and libpcre3-dev for building the custom SWIG tool for generating bindings. This is the apt-get line you'd need to install the requirements bar Qt on Ubuntu 14.04 or above: @@ -123,7 +123,7 @@ Your version of Ubuntu might not include a recent enough Qt version, so you can For Archlinux (as of 2017.04.18) you'll need: ``` -sudo pacman -S libx11 libxcb xcb-util-keysyms mesa libgl qt5-base qt5-x11extras cmake python3 bison autoconf automake pcre +sudo pacman -S libx11 libxcb xcb-util-keysyms mesa libgl qt5-base qt5-svg qt5-x11extras cmake python3 bison autoconf automake pcre ``` For Gentoo (as of 2017.04.18), you'll need: diff --git a/scripts/travis/linux_setup.sh b/scripts/travis/linux_setup.sh index 2b39cf912..d5c46f93c 100644 --- a/scripts/travis/linux_setup.sh +++ b/scripts/travis/linux_setup.sh @@ -6,7 +6,7 @@ sudo add-apt-repository -y 'ppa:beineri/opt-qt562-trusty' sudo add-apt-repository -y 'deb http://apt.llvm.org/precise/ llvm-toolchain-precise-3.8 main' wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo apt-get update -qq -sudo apt-get install --allow-unauthenticated -y -qq libx11-dev mesa-common-dev libgl1-mesa-dev qt56base qt56x11extras libxcb-keysyms1-dev gdb clang-format-3.8 g++-6 +sudo apt-get install --allow-unauthenticated -y -qq libx11-dev mesa-common-dev libgl1-mesa-dev qt56base qt56svg qt56x11extras libxcb-keysyms1-dev gdb clang-format-3.8 g++-6 # check formatting matches clang-format-3.8. Since newer versions can have # changes in formatting even without any rule changes, we have to fix on a