From 6a36e1dc8e7c6766eb3e614e6dd82c7124c732e3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 15 Jun 2018 14:50:35 -0400
Subject: [PATCH] CMake: make docs and code consistent.

 - Document the version requirements more accurately
---
 CMakeLists.txt |  4 ++--
 README.md      | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60048f44c..32cd8ab3c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ option( WITH_KF5Crash "Enable crash reporting with KCrash." ON )
 set( CALAMARES_ORGANIZATION_NAME "Calamares" )
 set( CALAMARES_ORGANIZATION_DOMAIN "github.com/calamares" )
 set( CALAMARES_APPLICATION_NAME  "Calamares" )
-set( CALAMARES_DESCRIPTION_SUMMARY 
+set( CALAMARES_DESCRIPTION_SUMMARY
     "The distribution-independent installer framework" )
 
 set( CALAMARES_VERSION_MAJOR 3 )
@@ -96,7 +96,7 @@ set( QT_VERSION 5.7.0 )
 set( YAMLCPP_VERSION 0.5.1 )
 set( ECM_VERSION 5.18 )
 set( PYTHONLIBS_VERSION 3.3 )
-set( BOOSTPYTHON_VERSION 1.54.0 )
+set( BOOSTPYTHON_VERSION 1.55.0 )
 
 
 ### CMAKE SETUP
diff --git a/README.md b/README.md
index a41ae6f7a..f35b012c8 100644
--- a/README.md
+++ b/README.md
@@ -15,11 +15,12 @@
 Main:
 * Compiler with C++11 support: GCC >= 4.9.0 or Clang >= 3.5.1
 * CMake >= 3.2
-* Qt >= 5.6
+* Qt >= 5.7
 * yaml-cpp >= 0.5.1
-* Python >= 3.3
-* Boost.Python >= 1.55.0
-* extra-cmake-modules (recommended; required for some modules)
+* Python >= 3.3 (required for some modules)
+* Boost.Python >= 1.55.0 (recommended, or PythonQt; one is required for some modules)
+* PythonQt (recommended, or Boost.Python; one is required for some modules)
+* extra-cmake-modules >= 5.18 (recommended; required for some modules)
 
 Modules:
 * welcome:
@@ -38,6 +39,6 @@ Modules:
 ### Building
 
 See [wiki](https://github.com/calamares/calamares/wiki) for up to date
-[building](https://github.com/calamares/calamares/wiki/Developer's-Guide)
-and [deployment](https://github.com/calamares/calamares/wiki/Deployer's-Guide)
+[building](https://github.com/calamares/calamares/wiki/Develop-Guide)
+and [deployment](https://github.com/calamares/calamares/wiki/Deploy-Guide)
 instructions.