From fbb0964e864b9ccbee7772acc9d659e24fa0c3d1 Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Sun, 18 Sep 2016 22:22:42 -0400 Subject: [PATCH] Update README.md --- README.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/README.md b/README.md index 3f6ced2cc..647f0570d 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ You need to install Qt as described below instead of using pre-built packages fr * Android: [Qt Android Setup](http://doc.qt.io/qt-5/androidgs.html) ###### Building using Qt Creator + * Launch Qt Creator and open the `qgroundcontrol.pro` project. * Select the appropriate kit for your needs: * OSX: Desktop Qt 5.5.1 clang 64 bit @@ -60,6 +61,18 @@ You need to install Qt as described below instead of using pre-built packages fr * Android: Android for armeabi-v7a (GCC 4.9, Qt 5.5.1) * Note: iOS builds must be built using xCode: http://doc.qt.io/qt-5/ios-support.html. Use Qt Creator to generate the XCode project (*Run Qmake* from the context menu). +###### Special case for Xcode 8 and Qt 5.5.1 + +Xcode 8 broke the Qt 5.5.1 build system (qmake). As this is the version of Qt we're using for the moment, you will need to patch your Qt installation to make the build work. This is for both Mac OS X and iOS. + +Under the tools directory, you will find a script used by the CI build to patch Qt (`patch_qt_for_xcode8.sh`). You can use this script as a starting point. You will need to edit a few variables it expects to run: + +``` +IOSDIR=//Qt/5.5/ios +OSXDIR=//Qt/5.5/clang_64 +TRAVIS_BUILD_DIR=//qgroundcontrol +``` + #### Vagrant A Vagrantfile is provided to build QGroundControl using the [Vagrant](https://www.vagrantup.com/) system. This will produce a native Linux build which can be run in the Vagrant Virtual Machine or on the host machine if it is compatible. -- 2.22.0