diff --git a/.appveyor.yml b/.appveyor.yml index c887b3b63c6385c58ddbb6938350a1cbeffd05ef..c1842b08d3a399693af837b8150541558c8e829f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,7 +15,7 @@ environment: install: - git submodule update --init --recursive - call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 - - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.8\msvc2015\bin;%PATH% + - set PATH=C:\Qt\Tools\QtCreator\bin;C:\Qt\5.9.1\msvc2015\bin;%PATH% - mkdir %LOCALAPPDATA%\QtProject && copy test\qtlogging.ini %LOCALAPPDATA%\QtProject\ - ps: | Write-Host "Installing GStreamer..." -ForegroundColor Cyan @@ -35,7 +35,7 @@ install: Write-Host "Installed" -ForegroundColor Green build_script: - - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.8\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro + - mkdir %SHADOW_BUILD_DIR% && cd %SHADOW_BUILD_DIR% && C:\Qt\5.9.1\msvc2015\bin\qmake -r CONFIG-=debug_and_release CONFIG+=%CONFIG% CONFIG+=WarningsAsErrorsOn %APPVEYOR_BUILD_FOLDER%\qgroundcontrol.pro - cd %SHADOW_BUILD_DIR% && jom - if "%CONFIG%" EQU "installer" ( copy %SHADOW_BUILD_DIR%\release\QGroundControl-installer.exe %APPVEYOR_BUILD_FOLDER%\QGroundControl-installer.exe ) # Generate the source server information to embed in the PDB diff --git a/.travis.yml b/.travis.yml index 15dbca27664110e933b07e6c9b2d62f8549c1e1f..f4476c219eb3017a9b6778e5edc93e27d17e920c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,9 +89,9 @@ before_install: install: # linux dependencies: qt - if [ "${SPEC}" = "linux-g++-64" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-linux-min.tar.bz2 && - tar jxf Qt5.7.1-linux-min.tar.bz2 -C /tmp && - export PATH=/tmp/Qt5.7-linux/5.7/gcc_64/bin:$PATH && + wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.1-linux-min.tar.bz2 && + tar jxf Qt5.9.1-linux-min.tar.bz2 -C /tmp && + export PATH=/tmp/Qt5.9-linux/5.9.1/gcc_64/bin:$PATH && export DISPLAY=:99.0 && sh -e /etc/init.d/xvfb start ; @@ -99,8 +99,8 @@ install: # android dependencies: qt, gstreamer, android-ndk - if [ "${SPEC}" = "android-g++" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-android-min.tar.bz2 && - tar jxf Qt5.7.1-android-min.tar.bz2 -C /tmp && + wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.1-android-min.tar.bz2 && + tar jxf Qt5.9.1-android-min.tar.bz2 -C /tmp && wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-android-armv7-1.5.2.tar.bz2 && mkdir -p ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 && tar jxf gstreamer-1.0-android-armv7-1.5.2.tar.bz2 -C ${TRAVIS_BUILD_DIR}/gstreamer-1.0-android-armv7-1.5.2 && @@ -109,21 +109,21 @@ install: ./android-ndk-r10e-linux-x86_64.bin > /dev/null && export ANDROID_NDK_ROOT=`pwd`/android-ndk-r10e && export ANDROID_SDK_ROOT=/usr/local/android-sdk && - export PATH=/tmp/Qt5.7-android/5.7/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH + export PATH=/tmp/Qt5.9-android/5.9.1/android_armv7/bin:`pwd`/android-ndk-r10e:$PATH && echo $PATH ; fi # osx dependencies: qt, gstreamer, gstreamer-devel - if [ "${SPEC}" = "macx-clang" ]; then - wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-mac-clang-min.tar.bz2 && - tar jxf Qt5.7.1-mac-clang-min.tar.bz2 -C /tmp && + wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.1-mac-clang-min.tar.bz2 && + tar jxf Qt5.9.1-mac-clang-min.tar.bz2 -C /tmp && wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-1.5.2-x86_64.pkg && sudo installer -verboseR -pkg gstreamer-1.0-1.5.2-x86_64.pkg -target / && wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/gstreamer-1.0-devel-1.5.2-x86_64.pkg && sudo installer -verboseR -pkg gstreamer-1.0-devel-1.5.2-x86_64.pkg -target / && wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/osx-gstreamer.tar.bz2 && sudo tar jxf osx-gstreamer.tar.bz2 -C /Library/Frameworks && - export QT_DIR=Qt5.7-mac-clang/5.7/clang_64 && + export QT_DIR=Qt5.9-mac-clang/5.9.1/clang_64 && export QT_QPA_PLATFORM_PLUGIN_PATH=/tmp/$QT_DIR/plugins && export QML2_IMPORT_PATH=/tmp/$QT_DIR/qml && export PATH=/tmp/$QT_DIR/bin:$PATH diff --git a/.vagrantconfig.yml b/.vagrantconfig.yml index 41c33efebcf9c26d44652db63156eaaa6d5423e5..bd54ba4c39b89ccec0ef21960814576a943b08cf 100644 --- a/.vagrantconfig.yml +++ b/.vagrantconfig.yml @@ -1,13 +1,13 @@ configs: dev: - 'qt_deps_tarball': 'Qt5.7.1-linux-vagrant.tar.bz2' + 'qt_deps_tarball': 'Qt5.9.1-linux-vagrant.tar.bz2' 'qt_deps_unpack_parent_dir': '/tmp' - 'qt_deps_unpack_dir': '/tmp/Qt5.7-vagrant/5.7' - 'qt_deps_bin_unpack_dir': '/tmp/Qt5.7-vagrant/5.7/gcc_64/bin' - 'qt_deps_lib_unpack_dir': '/tmp/Qt5.7-vagrant/5.7/gcc_64/lib' - 'qt_deps_plugins_unpack_dir': '/tmp/Qt5.7-vagrant/5.7/gcc_64/plugins' - 'qt_deps_qml_unpack_dir': '/tmp/Qt5.7-vagrant/5.7/gcc_64/qml' + 'qt_deps_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1' + 'qt_deps_bin_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/bin' + 'qt_deps_lib_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/lib' + 'qt_deps_plugins_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/plugins' + 'qt_deps_qml_unpack_dir': '/tmp/Qt5.9-vagrant/5.9.1/gcc_64/qml' 'project_root_dir': '/vagrant' @@ -20,4 +20,4 @@ configs: 'spec': 'linux-g++-64' 'shadow_build_dir': '/vagrant/shadow-build' 'pro': '/vagrant/qgroundcontrol.pro' - 'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.7.1-linux-vagrant.tar.bz2' + 'deps_url': 'https://s3-us-west-2.amazonaws.com/qgroundcontrol/dependencies/Qt5.9.1-linux-vagrant.tar.bz2' diff --git a/README.md b/README.md index ed2c3c8ecf5e8b9d5197c2b135f16d307599d0c4..6b00233ba8598bfabee424bf058ebae069444817 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,12 @@ QGroundControl builds are supported for OSX, Linux, Windows, iOS and Android. QG * Windows: Vista or higher, 32 bit, [Visual Studio 2015 compiler](http://www.visualstudio.com/downloads/download-visual-studio-vs#d-express-windows-desktop) * iOS: 8.0 and higher * Android: Jelly Bean (4.1) and higher. Standard QGC is built against ndk version 19. -* Qt version: 5.7.1 ONLY +* Qt version: 5.9.1 ONLY ###### Install QT You need to install Qt as described below instead of using pre-built packages from say, a Linux distribution, because QGroundControl needs access to private Qt headers. * Download the [Qt installer](http://www.qt.io/download-open-source) - * Make sure to install Qt version **5.7.1** NOT 5.4.x, 5.6.x, 5.8.x, etc. + * Make sure to install Qt version **5.9.1**. You will also need to install the Qt Speech package. * Ubuntu: Set the downloaded file to executable using:`chmod +x`. Install to default location for use with ./qgroundcontrol-start.sh. If you install Qt to a non-default location you will need to modify qgroundcontrol-start.sh in order to run downloaded builds. * Windows: Make sure to install VS 2015 32 bit package. @@ -59,10 +59,10 @@ You need to install Qt as described below instead of using pre-built packages fr * Launch Qt Creator and open the `qgroundcontrol.pro` project. * Select the appropriate kit for your needs: - * OSX: Desktop Qt 5.7.1 clang 64 bit - * Ubuntu: Desktop Qt 5.7.1 GCC bit - * Windows: Desktop Qt 5.7.1 MSVC2015 32bit - * Android: Android for armeabi-v7a (GCC 4.9, Qt 5.7.1) + * OSX: Desktop Qt 5.9.1 clang 64 bit + * Ubuntu: Desktop Qt 5.9.1 GCC bit + * Windows: Desktop Qt 5.9.1 MSVC2015 32bit + * Android: Android for armeabi-v7a (GCC 4.9, Qt 5.9.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). #### Vagrant