Update submodules on '6.3 in qt/qt5'

Change-Id: Ia4019f891a5da5d2f97d917f7845c32eff6b3184 Reviewed-by: Qt Submodule Update Bot <[email protected]>
CMake: Fix linux static tests config to actually run
2026-10-10 17:17:27 +08:00 · 2022-01-31 22:35:12 +00:00 · 2022-01-31 17:57:27 +00:00 · 2022-01-30 05:13:14 +00:00 · 2022-01-30 05:13:05 +00:00 · 2022-01-30 05:12:58 +00:00
49 changed files with 131 additions and 46 deletions
@@ -11,7 +11,7 @@
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
-	recommends = qtimageformats qtshadertools qtsvg
+	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
 	branch = 6.3
@@ -9,7 +9,7 @@ Configurations:
    Platform dependency: 'Ubuntu-20.04-host'
    Features: ['Packaging', 'InsignificantTests', 'VMSize8']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
+        'TARGET_CONFIGURE_ARGS=-DFEATURE_developer_build=ON -DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
        'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
        "TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen'",
        "TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
@@ -5,7 +5,7 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Sccache', 'MinimalStaticTests']
    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
+-
    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Features: ['Sccache', 'MinimalStaticTests']
@@ -0,0 +1,3 @@
+Version: 2
+Include: [cmake_platforms.yaml]
+Configurations: []
@@ -89,6 +89,18 @@ sudo cp $aarch64le_toolchain $targetPath
 sudo cp $armv7le_toolchain $targetPath
 sudo cp $x8664_toolchain $targetPath
 cp -R $QNX_qemu_bld_files_dir $qemuTargetPath
+# fc-match tool is missing from QNX SDP and tst_qfont requires it to work corretly
+# Download code-only package from https://www.iana.org/time-zones and follow README
+# to build tools for QNX x86_64. If need to build new tool create new qnx_qemu_utils
+# package which contains it and update required info below
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx_qemu_utils_20211208.tar.xz"
+targetFile="qnx_qemu_utils.tar.xz"
+targetFolder="$qemuTargetPath/local/misc_files"
+sha1="7653f5d50f61f1591d7785c3ec261228ecc9dd22"
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 sudo chown -R qt:users "$targetPath"

@@ -10,7 +10,7 @@ OPT_CRYPTODEV='no'
 DEF_OPT_CRYPTODEV='no'
 OPT_DATA_INODES='3000'
 DEF_OPT_DATA_INODES='3000'
-OPT_DATA_SIZE='60'
+OPT_DATA_SIZE='512'
 DEF_OPT_DATA_SIZE='60'
 OPT_EXTRA_DIRS='none'
 DEF_OPT_EXTRA_DIRS='none'
@@ -11,3 +11,7 @@ PATH=__IFS_PATH__:/system/xbin

 [uid=0 gid=0 dperms=755 type=dir] var/share
 var/share/zoneinfo=usr/share/zoneinfo
+
+[uid=0 gid=0 dperms=755 type=dir] var/share/fonts
+var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
+var/share/fonts=usr/share/fonts
@@ -6,3 +6,7 @@ HOME=/home/root
 TZ=Europe/Oslo
 procmgr_symlink /data/var/share /usr/share
 procmgr_symlink /data/var/share/zoneinfo/Europe/Oslo /data/var/etc/localtime
+
+# fontconfig
+procmgr_symlink /data/var/etc/fontconfig/fonts.conf /etc/fontconfig/fonts.conf
+procmgr_symlink /data/var/share/fonts /usr/share/fonts
@@ -12,3 +12,9 @@
 # resource manager supports a -U option for switching to non-root.
 echo "---> Starting Filesystem event manager (fsevmgr)"
 STARTU_P(fsevmg_t,__FSEVMG_ID__) fsevmgr -d -F __DEVB_ID__ -N __DEVB_ID__
+
+echo "---> Remove large fonts"
+rm -rf /data/var/share/fonts/NotoSansCJK*
+rm -rf /data/var/share/fonts/NotoSansMonoCJK*
+echo "---> Create fontconfig cache"
+fc-cache &
@@ -19,10 +19,10 @@ lib/libicudata.so.67=usr/lib/libicudata.so.67
 lib/libicui18n.so.67=usr/lib/libicui18n.so.67
 lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
 lib/libEGL.so.1=usr/lib/libEGL.so.1
-lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
 lib/libz.so.2=usr/lib/libz.so.2
 lib/libxml2.so.2=usr/lib/libxml2.so.2
-lib/libfreetype.so.1=usr/lib/libfreetype.so.1
+lib/libfreetype.so.23=usr/lib/libfreetype.so.23
+lib/libbz2.so.1=usr/lib/libbz2.so.1
 lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libbacktrace.so.1=usr/lib/libbacktrace.so.1
 lib/libm.so.3=lib/libm.so.3
@@ -44,3 +44,8 @@ lib/dll/img_codec_tif.so=lib/dll/img_codec_tif.so

 # for inotify
 xbin/fsevmgr=sbin/fsevmgr
+
+# for fontconfig
+lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
+xbin/fc-cache=bin/fc-cache
+xbin/fc-match=local/misc_files/fc-match
@@ -72,6 +72,9 @@ sudo zypper -nq install p7zip
 # EGL support
 sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel

+# ICU
+sudo zypper -nq install libicu-devel libicu-suse65_1
+
 # gtk3 style for QtGui/QStyle
 sudo zypper -nq install gtk3-devel

@@ -82,9 +85,6 @@ sudo zypper -nq install libXi-devel postgresql13 postgresql13-devel mysql-devel
 sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \
         xcb-util-wm-devel xcb-util-renderutil-devel

-# ICU
-sudo zypper -nq install libicu-devel libicu-suse65_1
-
 # qtwebengine
 sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
         libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+#############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+set -ex
+
+# This script will install up-to-date google Chrome needed for Webassembly auto tests.
+
+# shellcheck source=../common/unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
+# Webassembly auto tests run requires latest Chrome. Let's use the latest stable one which means we can't cache this
+sudo zypper ar http://dl.google.com/linux/chrome/rpm/stable/x86_64 Google-Chrome
+
+# Add the Google public signing key
+externalUrl="https://dl.google.com/linux/linux_signing_key.pub"
+Download "$externalUrl" "/tmp/linux_signing_key.pub"
+sudo rpm --import /tmp/linux_signing_key.pub
+
+# Update the repo cache of zypper and install Chrome
+sudo zypper ref -f
+sudo zypper -nq install --no-confirm google-chrome-stable
Author	SHA1	Message	Date
Qt Submodule Update Bot	19c8518536	Update submodules on '6.3 in qt/qt5' Change-Id: Ia4019f891a5da5d2f97d917f7845c32eff6b3184 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2022-01-31 22:35:12 +00:00
Alexandru Croitor	295eb3ea8b	CMake: Fix linux static tests config to actually run In `3c38cc22ce` the dash was accidentally removed and Coin was happy with it. Reintroduce the dash. Change-Id: Idc5d3833191b0390e2d0aa480681a5350d289037 Reviewed-by: Toni Saario <[email protected]> (cherry picked from commit `93afb606b4`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-01-31 17:57:27 +00:00
Pasi Petäjäjärvi	40dfcecd4a	CI: Add font support for QNX qemu Task-number: QTBUG-99168 Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5 Reviewed-by: Samuli Piippo <[email protected]> (cherry picked from commit `848a7d5fa3`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-01-30 05:13:14 +00:00
Pasi Petäjäjärvi	6b8dc3a273	CI: Enable developer build for QNX x86_64 Task-number: QTBUG-99168 Change-Id: I119f47ba0ee36a19a6daca05383c90304b34e97a Reviewed-by: Samuli Piippo <[email protected]> (cherry picked from commit `7486226c7a`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-01-30 05:13:05 +00:00
Pasi Petäjäjärvi	8a8f1b7654	CI: Update libraries because of new QNX toolchain QNX toolchain provides newer libfreetype which depends on new libbz2 library (qnx710-20211207-linux.tar.xz). Task-number: QTBUG-99168 Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd Reviewed-by: Samuli Piippo <[email protected]> (cherry picked from commit `2592bbe8c4`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-01-30 05:12:58 +00:00
Pasi Petäjäjärvi	c69258f175	CI: Increase size of QNX qemu image for data partition Some of the autotest require more free space to pass Task-number: QTBUG-99168 Change-Id: Iff4a4493e75d2770d691b936547143518a80e315 Reviewed-by: Samuli Piippo <[email protected]> (cherry picked from commit `4a5550cc03`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-01-30 05:12:47 +00:00
Qt Submodule Update Bot	4b6d11a77f	Update submodules on '6.3 in qt/qt5' Change-Id: If7823e3610645a58b7bbd40bd3fac081962a48d0 Reviewed-by: Qt Submodule Update Bot <[email protected]>	2022-01-27 11:34:39 +00:00
Jani Heikkinen	2d329b06e1	Add qtlanguageserver as a optional dependency for qtdeclarative Fixes: QTBUG-99737 Pick-to: dev Change-Id: I9dd71496b6ea974003158ffdd3e651beed60c31d Reviewed-by: Toni Saario <[email protected]>	2022-01-27 11:34:34 +00:00
Jukka Jokiniva	fb43a90fd1	Add yaml file for Android Automotive Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98 Reviewed-by: Jani Heikkinen <[email protected]> (cherry picked from commit `06b5cd95e6`)	2022-01-19 08:23:36 +00:00
Heikki Halmet	56a251d9a6	Provisioning: Install up-to-date google Chrome for Wasm auto tests Task-number: QTBUG-99062 Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b Reviewed-by: Tony Sarajärvi <[email protected]>	2022-01-12 09:07:46 +02:00
Heikki Halmet	9c5af22a53	Provisioning: Change installation order between libicu and gtk3 Gtk3-devel includes dependency which conflicts with libicu-devel. Changing installation order should solve it Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc Reviewed-by: Simo Fält <[email protected]> (cherry picked from commit `1e8939b4b2`) Reviewed-by: Qt Cherry-pick Bot <[email protected]>	2022-01-11 22:00:07 +00:00