From 7ef8d3545907824f5f02b18f9e6e953b9a2f0928 Mon Sep 17 00:00:00 2001 From: Vasily Date: Sat, 16 Feb 2019 14:45:16 +0100 Subject: [PATCH 1/2] Update Qt version on AppVeyor The 5.11.2 version has been removed from AppVeyor leading to all builds failing due to lack of Qt install. The 5.12 folder is symlinked to the newest Qt version, preventing the need for changes during small updates and preventing failures when versions have been removed. This solves https://github.com/OpenVR-Advanced-Settings/OpenVR-AdvancedSettings/issues/53 --- .appveyor.yml | 4 ++-- .travis.yml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index b3c3408..2b84678 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 environment: matrix: - - QT_LOC: '"C:\Qt\5.11.2\msvc2017_64\bin\"' + - QT_LOC: '"C:\Qt\5.12\msvc2017_64\bin\"' VS_LOC: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"' JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"' NSIS_LOC: '"C:\Program Files (x86)\NSIS\"' @@ -11,7 +11,7 @@ environment: PYTHON_LOC: '"C:\Python37\"' BUILD_PACKAGE: "1" - - QT_LOC: '"C:\Qt\5.11.2\msvc2017_64\bin\"' + - QT_LOC: '"C:\Qt\5.12\msvc2017_64\bin\"' VS_LOC: '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat"' JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"' NSIS_LOC: '"C:\Program Files (x86)\NSIS\"' diff --git a/.travis.yml b/.travis.yml index ba22bb5..20c31ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,5 +27,6 @@ install: script: - mkdir build && cd build + - qmake --version - qmake .. -spec $QMAKE_SPEC - make From 56b5f516ac3d0a07a3f9c758cffccef8ca3fa02c Mon Sep 17 00:00:00 2001 From: Vasily Date: Sat, 16 Feb 2019 14:48:27 +0100 Subject: [PATCH 2/2] Update windows build docs with recommended Qt version --- docs/building_for_windows.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building_for_windows.md b/docs/building_for_windows.md index f23731b..7f45ec3 100644 --- a/docs/building_for_windows.md +++ b/docs/building_for_windows.md @@ -14,7 +14,7 @@ For compiling: 1. [Microsoft Visual Studio](https://visualstudio.microsoft.com/downloads/) (tested on 2017 Community) -2. [Qt Framework](https://www.qt.io/download) version later than 5.6 (tested on 5.10 and 5.11) +2. [Qt Framework](https://www.qt.io/download) version later than 5.6 (Requires at least 5.6. 5.12 is recommended) 3. [Python 3](https://www.python.org/downloads/) (must be in `PATH` environment variable) For pushing changes to the repo: