diff options
| author | Liang Qi <liang.qi@qt.io> | 2020-04-24 15:31:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2020-04-24 15:31:01 +0200 |
| commit | cc4fdea014287bb2c2b7dfe55104c2d620026da5 (patch) | |
| tree | fd04d83477596ad43e514cd3f8f1cfbb477d0aea /coin/platform_configs/qtsdk.yaml | |
| parent | 285f2c5690290e49313ccf8b76402c30acabbb5e (diff) | |
| parent | ac8b28db576356431a1a414b2c08b2eb09c8b898 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.gitmodules
coin/platform_configs/qt5.yaml
coin/platform_configs/qtsdk.yaml
coin/platform_configs/tqtc-qt-rta.yaml
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
Diffstat (limited to 'coin/platform_configs/qtsdk.yaml')
| -rw-r--r-- | coin/platform_configs/qtsdk.yaml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml index b6160efd..2dc7f0bc 100644 --- a/coin/platform_configs/qtsdk.yaml +++ b/coin/platform_configs/qtsdk.yaml @@ -1,5 +1,5 @@ - - Template: 'qtci-windows-10-x86-3' + Template: 'qtci-windows-10-x86-4' Compiler: 'MSVC2019' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' - |