From 6c62b5506e060ac7a7590c4862335a3291e8eec4 Mon Sep 17 00:00:00 2001 From: Gres Date: Tue, 14 Jul 2020 22:51:24 +0300 Subject: [PATCH] Change qt version --- share/ci/config.py | 4 ++-- share/ci/get_qt.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/share/ci/config.py b/share/ci/config.py index a59b2e9..5d8d410 100644 --- a/share/ci/config.py +++ b/share/ci/config.py @@ -4,7 +4,7 @@ import re app_name = 'ScreenTranslator' target_name = app_name -qt_version = '5.14.0' +qt_version = '5.15.0' qt_modules = ['qtbase', 'qttools', 'icu', 'qttranslations', 'qtx11extras', 'qtwebengine', 'qtwebchannel', 'qtdeclarative', 'qtlocation', 'opengl32sw', 'd3dcompiler_47', @@ -30,6 +30,6 @@ os_name = getenv('OS', 'linux') app_version += {'linux': '', 'macos': '-experimental', 'win32': '', 'win64': ''}[os_name] bitness = '32' if os_name == 'win32' else '64' -msvc_version = getenv('MSVC_VERSION', '2017/Community') +msvc_version = getenv('MSVC_VERSION', '2019/Community') build_type = 'release' # 'debug' diff --git a/share/ci/get_qt.py b/share/ci/get_qt.py index 430ce2f..d159294 100644 --- a/share/ci/get_qt.py +++ b/share/ci/get_qt.py @@ -12,12 +12,12 @@ if os_name == 'linux': qt_dir_prefix = '{}/gcc_64'.format(qt_version) elif os_name == 'win32': os_url = 'windows_x86' - kit_arch = 'win32_msvc2017' - qt_dir_prefix = '{}/msvc2017'.format(qt_version) + kit_arch = 'win32_msvc2019' + qt_dir_prefix = '{}/msvc2019'.format(qt_version) elif os_name == 'win64': os_url = 'windows_x86' - kit_arch = 'win64_msvc2017_64' - qt_dir_prefix = '{}/msvc2017_64'.format(qt_version) + kit_arch = 'win64_msvc2019_64' + qt_dir_prefix = '{}/msvc2019_64'.format(qt_version) elif os_name == 'macos': os_url = 'mac_x64' kit_arch = 'clang_64'