Fix Qt version in AppVeyor

This commit is contained in:
Florian Märkl 2017-11-19 15:28:39 +01:00
parent cfc5f78c92
commit 5a0bf9c938
2 changed files with 6 additions and 6 deletions

View File

@ -16,9 +16,9 @@ branches:
environment: environment:
PYTHON: 'C:\Python36-x64' PYTHON: 'C:\Python36-x64'
NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip NINJA_URL: https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-win.zip
QTDIR: 'C:\Qt\5.9.1\msvc2015_64' QTDIR: 'C:\Qt\5.9.2\msvc2015_64'
QT32PATH: 'C:\Qt\5.9.1\msvc2015' QT32PATH: 'C:\Qt\5.9.2\msvc2015'
QT64PATH: 'C:\Qt\5.9.1\msvc2015_64' QT64PATH: 'C:\Qt\5.9.2\msvc2015_64'
VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat' VSVARSALLPATH: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat'
matrix: matrix:
- BITS: 32 - BITS: 32

View File

@ -2,8 +2,8 @@
echo Setting path echo Setting path
if "%OLDPATH%"=="" set OLDPATH=%PATH% if "%OLDPATH%"=="" set OLDPATH=%PATH%
if "%QT32PATH%"=="" set QT32PATH=C:\Qt\5.9.1\msvc2015 if "%QT32PATH%"=="" set QT32PATH=C:\Qt\5.9.2\msvc2015
if "%QT64PATH%"=="" set QT64PATH=C:\Qt\5.9.1\msvc2015_64 if "%QT64PATH%"=="" set QT64PATH=C:\Qt\5.9.2\msvc2015_64
if "%VSVARSALLPATH%"=="" set VSVARSALLPATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat if "%VSVARSALLPATH%"=="" set VSVARSALLPATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat
if "%1"=="32" ( if "%1"=="32" (
@ -40,4 +40,4 @@ cd ..
:restorepath :restorepath
echo Restoring path echo Restoring path
set PATH=%OLDPATH% set PATH=%OLDPATH%
set OLDPATH= set OLDPATH=