From fb01ee9494771aa16f3236b66e4509429d76d25d Mon Sep 17 00:00:00 2001
From: Bryant Mairs <bwmairs@gmail.com>
Date: Fri, 18 Jul 2014 07:31:46 -0700
Subject: [PATCH 1/3] Fixed extra paren in GAudioOutput.cc Broke windows
 compilation.

---
 src/GAudioOutput.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/GAudioOutput.cc b/src/GAudioOutput.cc
index f0dfb7f..2e40557 100644
--- a/src/GAudioOutput.cc
+++ b/src/GAudioOutput.cc
@@ -118,7 +118,7 @@ GAudioOutput::GAudioOutput(QObject *parent) : QObject(parent),
 
         if (FAILED(hr))
         {
-            qDebug() << "ERROR: Initializing voice for audio output failed!");
+            qDebug() << "ERROR: Initializing voice for audio output failed!";
         }
     }
 

From 8ce7153014d7c123c1b5f845faaaccb6b323add0 Mon Sep 17 00:00:00 2001
From: Bryant Mairs <bwmairs@gmail.com>
Date: Fri, 18 Jul 2014 07:32:53 -0700
Subject: [PATCH 2/3] Added details for platform/build requirements. Also added
 Qt version check. And made the platform/toolchain check a little more
 descriptive.

---
 README.md          | 14 +++++++++++---
 qgroundcontrol.pro | 36 ++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 1f33a37..b806b95 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,15 @@ QGroundControl can talk to XBee wireless devices using their proprietary protoco
 
 To disable XBee support you may add `DISABLE_XBEE` to the DEFINES argument.
 
-# Build on Mac OSX
+## Building QGroundControl
+
+### Requirements
+QGroundControl requires Qt5.2+ and SDL1.2 at a minimum. Additionally, only the following platform targets are supported:
+  * Windows: Microsoft Visual Studio 2010, 2012, 2013
+  * Linux: gcc, 32- or 64-bit
+  * Mac: LLVM+clang 64-bit
+
+## Build on Mac OSX
 
 To build on Mac OSX (10.6 or later):
 - - -
@@ -79,7 +87,7 @@ To build on Mac OSX (10.6 or later):
 3. Run `make -j4`
 
 
-# Build on Linux
+## Build on Linux
 
 To build on Linux:
 - - -
@@ -120,7 +128,7 @@ To build on Linux:
 6. Run qgroundcontrol
   1. `./release/qgroundcontrol`
 
-# Build on Windows
+## Build on Windows
 - - -
 
 Only compilation using Visual Studio 2010, 2012, and 2013 are supported.
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 34a7764..07a8dd1 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -23,17 +23,33 @@ message(Qt version $$[QT_VERSION])
 # to allow us to easily modify suported build types in one place instead of duplicated throughout
 # the project file.
 
-linux-g++ | linux-g++-64 {
-    message(Linux build)
-    CONFIG += LinuxBuild
-} else : win32-msvc2008 | win32-msvc2010 | win32-msvc2012 | win32-msvc2013 {
-    message(Windows build)
-    CONFIG += WindowsBuild
-} else : macx-clang | macx-llvm {
-    message(Mac build)
-    CONFIG += MacBuild
+!equals(QT_MAJOR_VERSION, 5) | !greaterThan(QT_MINOR_VERSION, 1) {
+    error("Unsupported Qt version, 5.2+ is required")
+}
+
+linux {
+    linux-g++ | linux-g++-64 {
+        message("Linux build")
+        CONFIG += LinuxBuild
+    } else {
+        message("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported")
+    }
+} else : win32 {
+    win32-msvc2010 | win32-msvc2012 | win32-msvc2013 {
+        message("Windows build")
+        CONFIG += WindowsBuild
+    } else {
+        message("Unsupported Windows toolchain, only Visual Studio 2010, 2012, and 2013 are supported")
+    }
+} else : macx {
+    macx-clang | macx-llvm {
+        message("Mac build")
+        CONFIG += MacBuild
+    } else {
+        message("Unsupported Mac toolchain, only 64-bit LLVM+clang is supported")
+    }
 } else {
-    error(Unsupported build type)
+    error("Unsupported build platform, only Linux, Windows, and Mac are supported")
 }
 
 # Installer configuration

From 4b7c587184fa772408c34a22ce601d13630dbe4b Mon Sep 17 00:00:00 2001
From: Bryant Mairs <bwmairs@gmail.com>
Date: Fri, 18 Jul 2014 07:36:46 -0700
Subject: [PATCH 3/3] Make sure we error on supported platforms.

---
 qgroundcontrol.pro | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 07a8dd1..b4477a7 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -32,21 +32,21 @@ linux {
         message("Linux build")
         CONFIG += LinuxBuild
     } else {
-        message("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported")
+        error("Unsuported Linux toolchain, only GCC 32- or 64-bit is supported")
     }
 } else : win32 {
     win32-msvc2010 | win32-msvc2012 | win32-msvc2013 {
         message("Windows build")
         CONFIG += WindowsBuild
     } else {
-        message("Unsupported Windows toolchain, only Visual Studio 2010, 2012, and 2013 are supported")
+        error("Unsupported Windows toolchain, only Visual Studio 2010, 2012, and 2013 are supported")
     }
 } else : macx {
     macx-clang | macx-llvm {
         message("Mac build")
         CONFIG += MacBuild
     } else {
-        message("Unsupported Mac toolchain, only 64-bit LLVM+clang is supported")
+        error("Unsupported Mac toolchain, only 64-bit LLVM+clang is supported")
     }
 } else {
     error("Unsupported build platform, only Linux, Windows, and Mac are supported")