diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-30 17:24:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-30 18:35:08 +0200 |
| commit | 54c94ae681e3a2689468ce810884e5f5611b97f0 (patch) | |
| tree | 1f4e4223357b1a1d05b8e72beb99393dfbff9920 /coin/platform_configs/qtwebengine.yaml | |
| parent | ff4a1141f26e66934d043d65881f1cf2aaecc788 (diff) | |
| parent | 5f03b84e6542f00cf9eccd1d8820f423cee5e2b9 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtwebkit.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
Diffstat (limited to 'coin/platform_configs/qtwebengine.yaml')
| -rw-r--r-- | coin/platform_configs/qtwebengine.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index 11dd6ddf..c5809149 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-16' + Template: 'qtci-windows-10-x86_64-17' Compiler: 'MSVC2019' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' |