diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 717550ad..b41c61e8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -863,7 +863,7 @@ build-VS2019-x64-shared-TRUE-apps: script: "CI\\Windows.bat" tags: - VS2019 - - Qt5150 + - Qt612 artifacts: paths: - build-release/*.exe @@ -891,7 +891,7 @@ build-VS2019-x64-shared-FALSE-apps: script: "CI\\Windows.bat" tags: - VS2019 - - Qt5150 + - Qt612 artifacts: paths: - build-release/*.exe diff --git a/CI/Windows.bat b/CI/Windows.bat index 4cca462a..41d596b5 100644 --- a/CI/Windows.bat +++ b/CI/Windows.bat @@ -56,8 +56,8 @@ IF "%BUILD_PLATFORM%" == "VS2019" ( set VS_PATH="C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\Common7\IDE\devenv.com" IF "%ARCHITECTURE%" == "x64" ( - set QT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 - set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\5.15.2\msvc2019_64 -DQT_VERSION=5 + set QT_INSTALL_PATH=E:\Qt\6.1.2\msvc2019_64 + set QT_BASE_CONFIG=-DQT_INSTALL_PATH=E:\Qt\6.1.2\msvc2019_64 -DQT_VERSION=6 ) ) diff --git a/CI/gitlab-ci/windows.yml b/CI/gitlab-ci/windows.yml index 01a994dc..85bffd7c 100644 --- a/CI/gitlab-ci/windows.yml +++ b/CI/gitlab-ci/windows.yml @@ -2,8 +2,8 @@ # Windows tasks # ----------------- -{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt5150} -{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt5150} +{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2019, QTTAG=Qt612} +{windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2019, QTTAG=Qt612} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=TRUE, VSVERSION=VS2017, QTTAG=Qt5101} {windows-template-job-apps.yml, ARCHITECTURE=x64, SHARED=FALSE, VSVERSION=VS2017, QTTAG=Qt5101}