From 1a7198a497e4ad70abdd121a80742b1fb736ceac Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Mon, 19 Oct 2015 16:45:43 -0700
Subject: [PATCH] Switch to Qt 5.5.1

---
 README.md | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 05076206f..b0e158d72 100644
--- a/README.md
+++ b/README.md
@@ -50,16 +50,19 @@ Each time you pull new source to your repository you should re-run "git submodul
 QGroundControl builds are supported for OSX, Linux and Windows. See the individual sections below for instruction on how to build on each OS. Also make sure to look at the "Additional Build Notes" section below.
 
 ### Build on Mac OSX
-Supported builds are 64 bit, built using the clang compiler.
+Supported builds are:
+* 64 bit
+* Built using the clang compiler
+* Built using Qt 5.5.1
 
 #### Install QT
 
-1. Download Qt 5.4 from: <http://download.qt-project.org/official_releases/qt/5.4/5.4.0/qt-opensource-mac-x64-clang-5.4.0.dmg>
+1. Download Qt 5.5.1 from: <http://download.qt-project.org/official_releases/qt/5.5/5.5.1/qt-opensource-mac-x64-clang-5.5.1.dmg>
 2. Double click the package installer and follow instructions.
 
 #### Build QGroundControl
 1. From the terminal change directory to your `groundcontrol` directory
-2. Run `~/Qt/5.4/clang_64/bin/qmake qgroundcontrol.pro -r -spec macx-clang`. If you installed a different version of Qt, or installed to a different location you may need to change the first portion of the path.
+2. Run `~/Qt/5.5/clang_64/bin/qmake qgroundcontrol.pro -r -spec macx-clang`. If you installed a different version of Qt, or installed to a different location you may need to change the first portion of the path.
 3. Run `make`
 
 ### Build on Linux
@@ -93,7 +96,10 @@ If you get this error when running qgroundcontrol: /usr/lib/x86_64-linux-gnu/lib
 3. Run `make`
 
 ### Build on Windows
-Supported builds for Windows are 32 bit only built using Visual Studio 2013 or higher.
+Supported builds are:
+* 32 bit only
+* Built using Visual Studio 2013 or higher
+* Built using Qt 5.5.0
 
 #### Install Windows USB driver to connect to Pixhawk/PX4Flow/3DR Radio
 Install from here: http://www.pixhawk.org/firmware/downloads
@@ -101,9 +107,9 @@ Install from here: http://www.pixhawk.org/firmware/downloads
 #### Install Visual Studio Express 2013
 Only compilation using Visual Studio 2013 is supported. Download and install Visual Studio Express Edition (free) from here: <http://www.visualstudio.com/downloads/download-visual-studio-vs#d-express-windows-desktop>. Make sure you install the Windows Desktop version.
 
-#### Install Qt5.4
-Download Qt 5.4 from here: <http://download.qt-project.org/official_releases/qt/5.4/5.4.0/qt-opensource-windows-x86-msvc2013_opengl-5.4.0.exe>
-  * The Qt variant should be for VS 2013, 32 bit (not 64) and include opengl.
+#### Install Qt5.5.0
+Download Qt 5.5.0 from here: <http://download.qt-project.org/official_releases/qt/5.5/5.5.0/qt-opensource-windows-x86-msvc2013-5.5.0.exe>
+  * The Qt variant should be for VS 2013, 32 bit (not 64).
 
 #### Build QGroundControl
 1. Open the Qt Command Prompt program from the Start Menu
@@ -112,7 +118,7 @@ Download Qt 5.4 from here: <http://download.qt-project.org/official_releases/qt/
 4. Now open the generated 'qgroundcontrol.sln' file in Visual Studio.
 5. Compile and edit in Visual Studio. If you need to add new files to the qgroundcontrol project, add them to QGCApplication.pro and re-run qmake from step 3.
 
-Note that the *Solution* contains two projets. The main QGroundControl project and the QGC Geoservice Provider Factory plugin. From within Visual Studio, before running or debugging, make sure you have *qgroundcontrol* as the current project (right-click and select *Set as Current Project*)
+Note that the *Solution* contains two projects. The main QGroundControl project and the QGC Geoservice Provider Factory plugin. From within Visual Studio, before running or debugging, make sure you have *qgroundcontrol* as the current project (right-click and select *Set as Current Project*)
 
 #### Alternate (Qt Creator IDE) Build Type (Any OS)
 All steps below assume you already have a running software development enviroment (i.e. gcc/g++ on Ubuntu, Xcode on Mac OSX along with the command line tools, Visual Studio on Windows, etc.) along with the various external dependencies described elsewhere in this document.
-- 
2.22.0