aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2019-12-19 15:28:53 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2020-04-04 17:13:43 +0300
commit8101b5471497ff9a617439971e7fdea0557fd39d (patch)
tree916a8227c8061bfc009eb3b6b16606a8ff7b7ad8 /coin/platform_configs
parentb3f626f83d1ea9c72659f7a0e34eda6a3d189eb4 (diff)
Provisioning: Update Windows 10 x86_64 to version 1909v5.15.0-beta3
These are also updated to tier1 image: msvc 2017: Not installed msvc 2019: version 16.4.4 msvc 2019 build tools: version 16.4.4 Task-number: QTQAINFRA-3623 Task-number: QTQAINFRA-3417 Change-Id: I006204ca090c4e2cf0d2ffc2309ab6b94f9b7d47 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/default.yaml12
-rw-r--r--coin/platform_configs/flashing-wizard.yaml4
-rw-r--r--coin/platform_configs/qdb.yaml4
-rw-r--r--coin/platform_configs/qt5.yaml20
-rw-r--r--coin/platform_configs/qtbase.yaml2
-rw-r--r--coin/platform_configs/qtconnectivity.yaml2
-rw-r--r--coin/platform_configs/qtsaferenderer.yaml4
-rw-r--r--coin/platform_configs/tqtc-qt-config-gui.yaml4
8 files changed, 26 insertions, 26 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index 6ef67f56..3fdefd84 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,7 +1,7 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
@@ -11,32 +11,32 @@ Configurations:
Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target arch: 'x86'
Compiler: 'MSVC2019'
Features: ['Packaging']
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_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -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% -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2015'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Features: ['Packaging']
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% -qt-zlib'
diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml
index 78a33c5b..eff6e9f6 100644
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -2,12 +2,12 @@ Version: 2
Module only: True
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Features: ['Packaging']
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% -static -no-icu'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging']
diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml
index 69f4b77f..f18909fe 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-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2015'
Target arch: 'x86'
Features: ['Packaging']
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-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2015'
Features: ['Packaging']
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%'
diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml
index 0dbb980c..56012f36 100644
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -1,13 +1,13 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2019'
@@ -20,26 +20,26 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019 -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'Mingw'
@@ -63,7 +63,7 @@ Configurations:
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'QNX_700'
Target arch: 'armv7'
Compiler: 'Mingw'
@@ -71,7 +71,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'QNX_700'
Target arch: 'armv8'
Compiler: 'Mingw'
@@ -79,7 +79,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qt-zlib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'QNX_700'
Target arch: 'x86_64'
Compiler: 'Mingw'
@@ -101,7 +101,7 @@ Configurations:
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index f1b6ca7b..a520e6ca 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -13,7 +13,7 @@
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'
diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml
index 30ac284d..6c232f2a 100644
--- a/coin/platform_configs/qtconnectivity.yaml
+++ b/coin/platform_configs/qtconnectivity.yaml
@@ -1,5 +1,5 @@
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Target os: 'WinRT_10'
Target arch: 'x86_64'
Compiler: 'MSVC2015'
diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml
index 322f1754..246925fb 100644
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -1,12 +1,12 @@
Version: 2
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
Features: ['Packaging', 'DisableTests']
diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml
index 22eaaffa..ad35fc2c 100644
--- a/coin/platform_configs/tqtc-qt-config-gui.yaml
+++ b/coin/platform_configs/tqtc-qt-config-gui.yaml
@@ -2,12 +2,12 @@ Version: 2
Module only: True
Configurations:
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Features: ['Packaging']
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% -static -no-icu'
-
- Template: 'qtci-windows-10-x86_64-16'
+ Template: 'qtci-windows-10-x86_64-17'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging']