From 2cee659c2d240b79909657436a6015aa2a24f6b2 Mon Sep 17 00:00:00 2001 From: Vasily Date: Wed, 17 Apr 2019 17:51:11 +0200 Subject: [PATCH] Update windows build docs for Qt 5.12 5.12.2 is the latest version and so the most likely version for people to download. --- build_scripts/win/common.py | 2 +- docs/building_for_windows.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build_scripts/win/common.py b/build_scripts/win/common.py index dfa01fa..59a6cee 100644 --- a/build_scripts/win/common.py +++ b/build_scripts/win/common.py @@ -24,7 +24,7 @@ ZIP_LOC_VAR_NAME = "ZIP_LOC" NSIS_LOC_VAR_NAME = "NSIS_LOC" LLVM_LOC_VAR_NAME = "LLVM_LOC" -QT_LOC_DEFAULT = r"C:\Qt\5.11.1\msvc2017_64\bin\"" +QT_LOC_DEFAULT = r"C:\Qt\5.12.2\msvc2017_64\bin\"" VS_LOC_DEFAULT = r"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" JOM_LOC_DEFAULT = r"C:\Qt\Tools\QtCreator\bin\jom.exe" ZIP_LOC_DEFAULT = r"C:\Program Files\7-Zip\7z.exe" diff --git a/docs/building_for_windows.md b/docs/building_for_windows.md index 7f45ec3..1246c27 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 (Requires at least 5.6. 5.12 is recommended) +2. [Qt Framework](https://www.qt.io/download) version equal to or greater than 5.12. 3. [Python 3](https://www.python.org/downloads/) (must be in `PATH` environment variable) For pushing changes to the repo: @@ -48,7 +48,7 @@ If an environment variable isn't set a default value will be provided. The defau | Environment Variable | Default Value | | -------------------- | ------------- | -| `QT_LOC` | `"C:\Qt\5.11.1\msvc2017_64\bin\"` | +| `QT_LOC` | `"C:\Qt\5.12.2\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"`| | `ZIP_LOC` | `"C:\Program Files\7-Zip\7z.exe"` |