From 7cc7f25c9259fee7c3b4ffa98a6f3c8ef0e9ddd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 27 Sep 2018 13:53:47 +0200 Subject: [PATCH 1/2] Switched Qt Build version for VS2013 to Qt-5.7 --- CI/Windows.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index 1969128b..388214b1 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -38,13 +38,13 @@ IF "%BUILD_PLATFORM%" == "VS2013" ( set GENERATOR=Visual Studio 12%ARCH_VS% set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\devenv.com" IF "%ARCHITECTURE%" == "x64" ( - set QT_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_64_opengl - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_64_opengl + set QT_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013_64 + set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013_64 ) IF "%ARCHITECTURE%" == "x32" ( - set QT_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_opengl - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.3.1-vs2013-%STRING_ARCH%\5.3\msvc2013_opengl + set QT_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013 + set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013_64 ) ) From 1e631a52cfed3bdbdf78f8c086712c8e483280d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Thu, 27 Sep 2018 13:54:36 +0200 Subject: [PATCH 2/2] FIxed Typo --- CI/Windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/Windows.bat b/CI/Windows.bat index 388214b1..c96a9e6c 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -44,7 +44,7 @@ IF "%BUILD_PLATFORM%" == "VS2013" ( IF "%ARCHITECTURE%" == "x32" ( set QT_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013 - set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013_64 + set QT_BASE_CONFIG=-DQT5_INSTALL_PATH=E:\Qt\Qt5.7.0\5.7\msvc2013 ) )