diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-09 13:14:09 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-09 13:14:09 +0200 |
| commit | 3a846d68b39044d010eb9a25fe975a20cc13bf5d (patch) | |
| tree | 61658a2df776c88bd741d5efa74fff6ca172585a | |
| parent | 16af59237ff7e15b7fcc999aa1b4983177fa56e1 (diff) | |
| parent | 576249566f8ce65ec2d2f0dc7e30ced3d3e1b955 (diff) | |
Merge remote-tracking branch 'origin/4.13' into 4.14
Change-Id: I6e5a6a22f229aa5000716ac7b22444faeb9d9038
| -rw-r--r-- | .github/workflows/build_qmake.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/build_qmake.yml b/.github/workflows/build_qmake.yml index 980341f..1970d67 100644 --- a/.github/workflows/build_qmake.yml +++ b/.github/workflows/build_qmake.yml @@ -3,9 +3,9 @@ name: QMake Build Matrix on: [push] env: - QT_VERSION: 5.14.2 - QT_CREATOR_VERSION: 4.13.0-beta1 - QT_CREATOR_SNAPSHOT: latest + QT_VERSION: 5.15.0 + QT_CREATOR_VERSION: 4.13.0 + QT_CREATOR_SNAPSHOT: NO PLUGIN_PRO: haskell.pro PLUGIN_NAME: Haskell @@ -63,11 +63,11 @@ jobs: if ("${{ runner.os }}" STREQUAL "Windows") set(url_os "windows_x86") if ("${{ matrix.config.environment_script }}" MATCHES "vcvars64.bat") - set(qt_package_name "qt.qt5.${qt_version_dotless}.win64_msvc2017_64") - set(qt_dir_prefix "${qt_version}/msvc2017_64") + set(qt_package_name "qt.qt5.${qt_version_dotless}.win64_msvc2019_64") + set(qt_dir_prefix "${qt_version}/msvc2019_64") elseif ("${{ matrix.config.environment_script }}" MATCHES "vcvars32.bat") - set(qt_package_name "qt.qt5.${qt_version_dotless}.win32_msvc2017") - set(qt_dir_prefix "${qt_version}/msvc2017") + set(qt_package_name "qt.qt5.${qt_version_dotless}.win32_msvc2019") + set(qt_dir_prefix "${qt_version}/msvc2019") else() endif() elseif ("${{ runner.os }}" STREQUAL "Linux") |