Commit ff0a81bf authored by Don Gagne's avatar Don Gagne

Update to Qt 5.4

parent ea722c48
...@@ -51,28 +51,25 @@ Supported builds are 64 bit, built using the clang compiler. ...@@ -51,28 +51,25 @@ Supported builds are 64 bit, built using the clang compiler.
#### Install QT #### Install QT
- - - - - -
1. Download Qt 5.3 from: <http://download.qt-project.org/official_releases/qt/5.3/5.3.1/qt-opensource-mac-x64-clang-5.3.1.dmg> 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>
2. Double click the package installer and follow instructions. 2. Double click the package installer and follow instructions.
#### Build QGroundControl #### Build QGroundControl
1. From the terminal change directory to your `groundcontrol` directory 1. From the terminal change directory to your `groundcontrol` directory
2. Run `~/Qt5.3.1/5.3/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.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.
3. Run `make` 3. Run `make`
### Build on Linux ### Build on Linux
Supported builds for Linux are 32 or 64-bit, built using gcc. Supported builds for Linux are 32 or 64-bit, built using gcc.
#### Install Qt5.3+ and SDL1.2 prerequistites #### Install Qt5.4 and SDL1.2 prerequistites
* For Ubuntu (requires 14.10 for Qt5.3): `sudo apt-get install qtcreator qttools5-dev qtbase5-dev qt5-default qtdeclarative5-dev libqt5serialport5-dev libqt5svg5-dev libqt5webkit5-dev libsdl1.2-dev build-essential libudev-dev qml-module-qtgraphicaleffects`
* For Fedora: `sudo yum install qt-creator qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtserialport-devel qt5-qtsvg-devel qt5-qtwebkit-devel SDL-devel SDL-static systemd-devel` * For Fedora: `sudo yum install qt-creator qt5-qtbase-devel qt5-qtdeclarative-devel qt5-qtserialport-devel qt5-qtsvg-devel qt5-qtwebkit-devel SDL-devel SDL-static systemd-devel`
* For Arch Linux: `pacman -Sy qtcreator qt5-base qt5-declarative qt5-serialport qt5-svg qt5-webkit` * For Arch Linux: `pacman -Sy qtcreator qt5-base qt5-declarative qt5-serialport qt5-svg qt5-webkit`
* For Ubuntu: Please be aware that the time of writing, Qt5.4 is unavailable in the official repositories Ubuntu 14.04/Mint 17.*.
##### Install Qt5.3+ from PPA * Add this PPA to your sources.list: `ppa:beineri/opt-qt54-trusty`
Note: Please be aware that the time of writing, Qt5.3 is unavailable in the official repositories Ubuntu 14.04/Mint 17.*. If it has become available since, please follow the instructions for installing Qt5.3 on Ubuntu. * Run the following in your terminal: `sudo apt-get update && sudo apt-get install qt54tools qt54base qt54declarative qt54serialport qt54svg qt54webkit qt54quickcontrols qt54xmlpatterns qt54x11extras qt54websockets qt54sensors qt54script qt54quick1 qt54qbs qt54multimedia qt54location qt54imageformats qt54graphicaleffects qt54creator qt54connectivity`
* Add this PPA to your sources.list: `ppa:beineri/opt-qt532-trusty` * Next, set the environment variables by executing in the terminal: `source /opt/qt53/bin/qt53-env.sh` or copy and paste the contents to your `~/.profile` file to set them on login.
* Run the following in your terminal: `sudo apt-get update && sudo apt-get install qt53tools qt53base qt53declarative qt53serialport qt53svg qt53webkit qt53quickcontrols qt53graphicaleffects` * Verify that the variables have been set: `echo $PATH && echo $QTDIR`. The output should read `/opt/qt53/bin:...` and `/opt/qt53`.
* Next, set the environment variables by executing in the terminal: `source /opt/qt53/bin/qt53-env.sh` or copy and paste the contents to your `~/.profile` file to set them on login.
* Verify that the variables have been set: `echo $PATH && echo $QTDIR`. The output should read `/opt/qt53/bin:...` and `/opt/qt53`.
#### [Optional] Install additional libraries #### [Optional] Install additional libraries
* For text-to-speech (espeak) * For text-to-speech (espeak)
...@@ -95,8 +92,8 @@ Supported builds for Windows are 32 bit only built using Visual Studio 2013 or h ...@@ -95,8 +92,8 @@ Supported builds for Windows are 32 bit only built using Visual Studio 2013 or h
#### Install Visual Studio Express 2013 #### 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. 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 QT #### Install Qt5.4
Download Qt 5.3 from here: <http://download.qt-project.org/official_releases/qt/5.3/5.3.2/qt-opensource-windows-x86-msvc2013_opengl-5.3.2.exe> 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. * The Qt variant should be for VS 2013, 32 bit (not 64) and include opengl.
#### Build QGroundControl #### Build QGroundControl
......
...@@ -29,8 +29,8 @@ exists(user_config.pri):infile(user_config.pri, CONFIG) { ...@@ -29,8 +29,8 @@ exists(user_config.pri):infile(user_config.pri, CONFIG) {
# to allow us to easily modify suported build types in one place instead of duplicated throughout # to allow us to easily modify suported build types in one place instead of duplicated throughout
# the project file. # the project file.
!equals(QT_MAJOR_VERSION, 5) | !greaterThan(QT_MINOR_VERSION, 1) { !equals(QT_MAJOR_VERSION, 5) | !greaterThan(QT_MINOR_VERSION, 3) {
error("Unsupported Qt version, 5.2+ is required") error("Unsupported Qt version, 5.4+ is required")
} }
linux { linux {
...@@ -117,8 +117,8 @@ QT += network \ ...@@ -117,8 +117,8 @@ QT += network \
serialport \ serialport \
sql \ sql \
printsupport \ printsupport \
quick \ qml \
quickwidgets quick
contains(DEFINES, QGC_NOTIFY_TUNES_ENABLED) { contains(DEFINES, QGC_NOTIFY_TUNES_ENABLED) {
QT += multimedia QT += multimedia
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment