From bd994848e19c21add095b22a645c18802a461720 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Wed, 11 Oct 2017 15:56:32 -0600 Subject: [PATCH] Improve docs for picking Qt version on Linux --- CONTRIBUTING.md | 2 +- qrenderdoc/qrenderdoc.pro | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c3318271c..5b6d63fab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -136,7 +136,7 @@ This is the apt-get line you'd need to install the requirements bar Qt on Ubuntu sudo apt-get install libx11-dev libx11-xcb-dev mesa-common-dev libgl1-mesa-dev libxcb-keysyms1-dev cmake python3-dev bison autoconf automake libpcre3-dev ``` -Your version of Ubuntu might not include a recent enough Qt version, so you can use [Stephan Binner's ppas](https://launchpad.net/~beineri) to install a more recent version of Qt. At least 5.6.2 is required. +Your version of Ubuntu might not include a recent enough Qt version, so you can use [Stephan Binner's ppas](https://launchpad.net/~beineri) to install a more recent version of Qt. At least 5.6.2 is required. If you choose to instead install an [official Qt release](https://download.qt.io/official_releases/qt/) or build Qt from source, add `-DQMAKE_QT5_COMMAND=/path/to/qmake` to your cmake arguments to specify where to find it. For Archlinux (as of 2017.04.18) you'll need: diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index a2d7dbf32..1f95f9cd9 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -8,9 +8,9 @@ QT += core gui widgets svg CONFIG += silent -lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5") +lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5.6; found $$[QT_VERSION]") -equals(QT_MAJOR_VERSION, 5): lessThan(QT_MINOR_VERSION, 6): error("requires Qt 5.6") +equals(QT_MAJOR_VERSION, 5): lessThan(QT_MINOR_VERSION, 6): error("requires Qt 5.6; found $$[QT_VERSION]") TARGET = qrenderdoc TEMPLATE = app