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/qtbase.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/qtbase.yaml')
| -rw-r--r-- | coin/platform_configs/qtbase.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 57978a84..f1eaf768 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -23,7 +23,7 @@ Configurations: Features: ['DisableTests', 'UseLegacyInstructions'] 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-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['DisableTests', 'UseLegacyInstructions'] @@ -38,7 +38,7 @@ Configurations: Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - - Template: 'qtci-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - |