diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-02-28 13:30:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-02-28 13:49:10 +0100 |
| commit | 08e63423e2ae3751e42f27307b290048e397dd7a (patch) | |
| tree | 93121ff564bb891990b92d09a10863ff921f4119 /coin/platform_configs/qdb.yaml | |
| parent | aa977addd2b6b87d702ea58e4bcf2d1e514305d3 (diff) | |
| parent | 97aa53410e3b1cc9a5a9eb2fdbf8c2be7e1ab852 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
.gitmodules
coin/platform_configs/default.yaml
coin/platform_configs/flashing-wizard.yaml
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtconnectivity.yaml
coin/platform_configs/tqtc-qt-config-gui.yaml
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
Diffstat (limited to 'coin/platform_configs/qdb.yaml')
| -rw-r--r-- | coin/platform_configs/qdb.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index d36a21d2..e42780b7 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -2,13 +2,13 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' Target arch: 'x86' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%' - - Template: 'qtci-windows-10-x86_64-14' + Template: 'qtci-windows-10-x86_64-16' Compiler: 'MSVC2015' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%' |