Skip to content

Commit

Permalink
Change VS2015 to use QT 5.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Collisionc committed May 22, 2016
1 parent ee8b56a commit 2e0c860
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions WinReleaseScripts/WinCompileUpload-webengine - QT 5.6.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
:: - "open downloads" is the command that selects the downloads alias in winscp, which for me is the simulationcraft server. Change downloads to whatever suits you.
:: MSVC 2015 - Fully updated
:: Git
:: QT 5.6.0, or whatever version we are currently using
:: QT 5.6.1, or whatever version we are currently using
:: Inno Setup - http://www.jrsoftware.org/isinfo.php - Used to make the installer, optional if you just want a compressed file.

@echo off
Expand All @@ -17,7 +17,7 @@ set simcversion=703-01-BETA
:: For bumping the minor version, just change the above line. Make sure to also change setup32.iss and setup64.iss as well.
set simcfiles=C:\Simulationcraft\
:: Location of source files
set qt_dir=C:\Qt\Qt5.6.0\5.6\
set qt_dir=C:\Qt\Qt5.6.1\5.6\
:: Location of QT
set redist=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist\
:: This is a really standard location for VS2015, but change it if you installed it somewhere else.
Expand Down
2 changes: 1 addition & 1 deletion vs/Qt_vs2015.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Label="PropertySheets" />
<PropertyGroup Label="UserMacros">
<QTDIR_x64>C:\Qt\Qt5.6.0\5.6\msvc2015_64</QTDIR_x64>
<QTDIR_x64>C:\Qt\Qt5.6.1\5.6\msvc2015_64</QTDIR_x64>
</PropertyGroup>
</Project>

0 comments on commit 2e0c860

Please sign in to comment.