SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83 from OpenVR-Advanced-Settings/update-to-qt5.12

Browse Source 
Update to qt5.12
This commit is contained in:
Robin Appelman
2019-02-16 15:07:44 +01:00
committed by GitHub
parent ca67502fc5 56b5f516ac
commit f8aa2512eb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.appveyor.yml
+2 -2
View File
@@ -2,7 +2,7 @@ image: Visual Studio 2017
environment: environment:
matrix: 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"' 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"' JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"'
NSIS_LOC: '"C:\Program Files (x86)\NSIS\"' NSIS_LOC: '"C:\Program Files (x86)\NSIS\"'
@@ -11,7 +11,7 @@ environment:
PYTHON_LOC: '"C:\Python37\"' PYTHON_LOC: '"C:\Python37\"'
BUILD_PACKAGE: "1" 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"' 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"' JOM_LOC: '"C:\Qt\Tools\QtCreator\bin\jom.exe"'
NSIS_LOC: '"C:\Program Files (x86)\NSIS\"' NSIS_LOC: '"C:\Program Files (x86)\NSIS\"'
.travis.yml
+1
View File
@@ -27,5 +27,6 @@ install:
script: script:
- mkdir build && cd build - mkdir build && cd build
- qmake --version
- qmake .. -spec $QMAKE_SPEC - qmake .. -spec $QMAKE_SPEC
- make - make
docs/building_for_windows.md
+1 -1
View File
@@ -14,7 +14,7 @@
For compiling: For compiling:
1. [Microsoft Visual Studio](https://visualstudio.microsoft.com/downloads/) (tested on 2017 Community) 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) 3. [Python 3](https://www.python.org/downloads/) (must be in `PATH` environment variable)
For pushing changes to the repo: For pushing changes to the repo: