From 268283a7c5849bb62fb106878044bc22dd775f59 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 29 Jan 2021 10:46:19 +0200 Subject: Enable all cmake targets for qtdatavis3d Task-number: QTBUG-90428 Change-Id: I36dee95a407d9b16dce8af326e581d47a0e69d8e Reviewed-by: Toni Saario --- coin/platform_configs/qtdatavis3d.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 coin/platform_configs/qtdatavis3d.yaml diff --git a/coin/platform_configs/qtdatavis3d.yaml b/coin/platform_configs/qtdatavis3d.yaml new file mode 100644 index 00000000..c3233842 --- /dev/null +++ b/coin/platform_configs/qtdatavis3d.yaml @@ -0,0 +1,3 @@ +Version: 2 +Include: [cmake_platforms.yaml] +Configurations: [] -- cgit v1.2.3 From e6ecc001f6ee5da3b8200fa2b00e4648388b6ef5 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 28 Jan 2021 11:31:12 +0200 Subject: Replace CentOS 8.1 with CentOS 8.3 in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3964 Change-Id: I368e59867e8061ed25d4d3f10de7e995e56bd676 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi --- coin/platform_configs/cmake_platforms.yaml | 4 +- .../cmake_platforms_target_android_host_linux.yaml | 16 +-- coin/platform_configs/flashing-wizard.yaml | 2 +- coin/platform_configs/qdb.yaml | 2 +- coin/platform_configs/qtbase.yaml | 4 +- coin/platform_configs/qtsaferenderer.yaml | 2 +- coin/platform_configs/qtwebengine.yaml | 2 +- .../README_MANUAL_INSTALLATIONS | 45 ------ .../README_MANUAL_INSTALLATIONS | 50 +++++++ .../01-install_telegraf.sh | 3 - .../01-remove_network_manager_secret_key.sh | 9 -- .../01-remove_stable-privacy.sh | 38 ----- .../qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh | 54 ------- .../03-enable-repos.sh | 84 ----------- .../04-install-packages.sh | 160 --------------------- .../qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh | 46 ------ .../05-libclang-v100-dyn.sh | 6 - .../qtci-linux-CentOS-8.1-x86_64/05-libclang.sh | 6 - .../qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh | 39 ----- .../qtci-linux-CentOS-8.1-x86_64/08-integrity.sh | 39 ----- .../09-disable_selinux.sh | 39 ----- .../qtci-linux-CentOS-8.1-x86_64/20-sccache.sh | 3 - .../qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh | 37 ----- .../qtci-linux-CentOS-8.1-x86_64/30-fbx.sh | 6 - .../30-install-conan.sh | 6 - .../qtci-linux-CentOS-8.1-x86_64/30-install_icu.sh | 76 ---------- .../35-install-breakpad.sh | 6 - .../40-android_linux.sh | 39 ----- .../40-install-cmake.sh | 43 ------ .../50-openssl_for_android_linux.sh | 38 ----- .../60-install_protobuff.sh | 40 ------ .../70-install_QemuGA.sh | 41 ------ .../qtci-linux-CentOS-8.1-x86_64/70-install_dwz.sh | 42 ------ .../qtci-linux-CentOS-8.1-x86_64/90-squish.sh | 4 - .../qtci-linux-CentOS-8.1-x86_64/99-version.sh | 48 ------- .../01-install_telegraf.sh | 3 + .../01-remove_network_manager_secret_key.sh | 9 ++ .../01-remove_stable-privacy.sh | 38 +++++ .../qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh | 54 +++++++ .../03-enable-repos.sh | 84 +++++++++++ .../04-install-packages.sh | 160 +++++++++++++++++++++ .../qtci-linux-CentOS-8.3-x86_64/04-p7zip.sh | 46 ++++++ .../05-libclang-v100-dyn.sh | 6 + .../qtci-linux-CentOS-8.3-x86_64/05-libclang.sh | 6 + .../qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh | 39 +++++ .../qtci-linux-CentOS-8.3-x86_64/08-integrity.sh | 39 +++++ .../09-disable_selinux.sh | 39 +++++ .../qtci-linux-CentOS-8.3-x86_64/20-sccache.sh | 3 + .../qtci-linux-CentOS-8.3-x86_64/22-mqtt_broker.sh | 37 +++++ .../qtci-linux-CentOS-8.3-x86_64/30-fbx.sh | 6 + .../30-install-conan.sh | 6 + .../qtci-linux-CentOS-8.3-x86_64/30-install_icu.sh | 76 ++++++++++ .../35-install-breakpad.sh | 6 + .../40-android_linux.sh | 39 +++++ .../40-install-cmake.sh | 43 ++++++ .../50-openssl_for_android_linux.sh | 38 +++++ .../60-install_protobuff.sh | 40 ++++++ .../70-install_QemuGA.sh | 41 ++++++ .../qtci-linux-CentOS-8.3-x86_64/70-install_dwz.sh | 42 ++++++ .../qtci-linux-CentOS-8.3-x86_64/90-squish.sh | 4 + .../qtci-linux-CentOS-8.3-x86_64/99-version.sh | 48 +++++++ 61 files changed, 1018 insertions(+), 1013 deletions(-) delete mode 100644 coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS create mode 100644 coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-install_telegraf.sh delete mode 100644 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh delete mode 100644 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_stable-privacy.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-install-packages.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/08-integrity.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/09-disable_selinux.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/20-sccache.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-fbx.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install-conan.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install_icu.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/35-install-breakpad.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-android_linux.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-install-cmake.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/50-openssl_for_android_linux.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/60-install_protobuff.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_QemuGA.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_dwz.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/90-squish.sh delete mode 100755 coin/provisioning/qtci-linux-CentOS-8.1-x86_64/99-version.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-install_telegraf.sh create mode 100644 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_network_manager_secret_key.sh create mode 100644 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_stable-privacy.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-enable-repos.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-p7zip.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang-v100-dyn.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/08-integrity.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/09-disable_selinux.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/20-sccache.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-fbx.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install_icu.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/35-install-breakpad.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-android_linux.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-install-cmake.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_QemuGA.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_dwz.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-version.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 9c884fa8..f8a90823 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -78,8 +78,8 @@ Configurations: 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Id: 'CentOS-8.1-host' - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Id: 'CentOS-8.3-host' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'Sccache'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY' diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml index 332a55ba..1df40936 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml @@ -1,45 +1,45 @@ Version: 2 Configurations: - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 0d11d641..21730f91 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -13,7 +13,7 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -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_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% -static -no-icu' - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 3473aac1..a1cb71fd 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -13,7 +13,7 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -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%' - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 681d11fe..1493629a 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -5,12 +5,12 @@ Include: [ ] Configurations: - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' - Platform dependency: 'CentOS-8.1-host' + Platform dependency: 'CentOS-8.3-host' Features: ['Packaging', 'Sccache', 'AndroidTestRun'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index a8c154c6..8ba4e2dc 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -13,7 +13,7 @@ Configurations: Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -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% -platform win32-g++' - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index e4a222d8..ccf3af63 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -22,7 +22,7 @@ Configurations: Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-CentOS-8.1-x86_64-50' + Template: 'qtci-linux-CentOS-8.3-x86_64-50' Compiler: 'GCC' Features: ['UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s' diff --git a/coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS deleted file mode 100644 index 1ec2f649..00000000 --- a/coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS +++ /dev/null @@ -1,45 +0,0 @@ -### CENTOS 8.1 ### -Hard Disk: 500G -Network: CI -Video Card: Total Video Memory: 64MB -Boot options/Firmware: BIOS - -Language: English (United States) -Time & Date: Europe/Helsinki -Software Selection: Server with GUI -Network & Host..: Connect - -Language: English (US) -Typing:English (US) -Privacy: Location Services: OFF -Connect Your Online Accounts: Skip - - -# Configure Settings - Notifications: - * Notification Popups: OFF - * Lock Screen Notifications: OFF - Privacy: - * Screen Lock: OFF - Power: - * Blank screen: Never - Devices: - * Displays: Resolution 1280 x 800 - Details: - * Time Zone: GMT - * Users: Automatic login on - -# Add user to sudoers -Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt - -# Fetch and run coin-setup -Download http://coin/coin/binary/linux_386/coin-setup - -run 'sudo ./coin-setup' - -Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub -grub2-mkconfig -o /etc/grub2.cfg -grub2-mkconfig -o /boot/grub2/grub.cfg - -Reboot - diff --git a/coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS new file mode 100644 index 00000000..4a775302 --- /dev/null +++ b/coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS @@ -0,0 +1,50 @@ +### CENTOS 8.3 ### +Hard Disk: 500G +Network: CI +Video Card: Total Video Memory: 64MB +Boot options/Firmware: BIOS + +Language: English (United States) +Time & Date: Etc/Coordinated Universal Time +Software Selection: Server with GUI +Network & Host..: Connect + +Language: English (US) +Typing:English (US) +Privacy: Location Services: OFF +Connect Your Online Accounts: Skip + + +# Configure Settings + Notifications: + * Notification Popups: OFF + * Lock Screen Notifications: OFF + Privacy: + * Screen Lock: OFF + Power: + * Blank screen: Never + Devices: + * Displays: Resolution 1280 x 800 + Details: + * Time Zone: UTC + * run "sudo timedatectl set-timezone Etc/UTC" + * Users: Automatic login on + +# Add user to sudoers +Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt + +Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub +sudo grub2-mkconfig -o /etc/grub2.cfg +sudo grub2-mkconfig -o /boot/grub2/grub.cfg + +# Add support for virtio driver +su +echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf +dracut -f + +# Fetch and run coin-setup +Download http://coin/coin/binary/linux_amd64/coin-setup +run './coin-setup' + +Reboot + diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-install_telegraf.sh deleted file mode 100755 index 729f9003..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-install_telegraf.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh deleted file mode 100644 index 5ed44f2d..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -# Ipv6 link local becomes tentative and dadfailed if two systems has the same secret_key -# New unique secret key will be created automatically during start up. -# https://access.redhat.com/solutions/3553581 -echo "Removing secret_key" -sudo rm -f "/var/lib/NetworkManager/secret_key" - - diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_stable-privacy.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_stable-privacy.sh deleted file mode 100644 index 5fdf5804..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_stable-privacy.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 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 - -echo "Change default stable-secret to based on MAC" -sudo sed -i '/^IPV6_ADDR_GEN_MODE/d' "/etc/sysconfig/network-scripts/ifcfg-ens192" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh deleted file mode 100755 index 6d31a941..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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 - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/shared/network_test_server_ip.txt -source "$BASEDIR/../common/shared/network_test_server_ip.txt" - -echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" -echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts -echo "Set DISPLAY" -echo 'export DISPLAY=":0"' >> ~/.bashrc -# for current session -export DISPLAY=:0 - -# Set timezone to UTC. -sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh deleted file mode 100755 index b5db7675..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh +++ /dev/null @@ -1,84 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 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 - -sudo rm -f /etc/yum.repos.d/*.repo - -sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <> ~/versions.txt - diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh deleted file mode 100755 index 45565766..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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 - -name="p7zip" -version="7-11" -sudo yum -y install "$name" - -# Link 7za to 7z so we can use existing installation scripts -sudo ln -s /usr/bin/7za /usr/bin/7z - -echo "$name = $version" >> ~/versions.txt - diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh deleted file mode 100755 index fbf34ddd..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang-v100-dyn.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/unix/libclang-v100-dyn.sh -"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang.sh deleted file mode 100755 index 7074cbc1..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -set -ex - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh deleted file mode 100755 index 92c741fb..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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 - -# shellcheck source=../common/linux/qnx_700.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/08-integrity.sh deleted file mode 100755 index 154370da..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/08-integrity.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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 - -# shellcheck source=../common/linux/integrity.sh -source "${BASH_SOURCE%/*}/../common/linux/integrity.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/09-disable_selinux.sh deleted file mode 100755 index b7a53cd4..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/09-disable_selinux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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 - -# shellcheck source=../common/linux/disable_selinux.sh -source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/20-sccache.sh deleted file mode 100755 index b371d947..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/20-sccache.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh deleted file mode 100755 index e677427f..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -# shellcheck source=../common/unix/mqtt_broker.sh -source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-fbx.sh deleted file mode 100755 index d8df4375..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-fbx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install-conan.sh deleted file mode 100755 index ec54fa54..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install-conan.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/install-conan.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install_icu.sh deleted file mode 100755 index ce42e844..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install_icu.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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$ -## -############################################################################# - -# shellcheck source=../common/unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" - -set -ex - -# This script will install ICU - -icuVersion="56.1" -icuLocation="/usr/lib64" -sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c" -baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" -baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" - -sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864" -develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" -develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" - -echo "Installing custom ICU $icuVersion $sha1 packages on CentOS to $icuLocation" - -targetFile=$(mktemp) -DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" -sudo 7z x -y -o/usr/lib64 "$targetFile" -sudo rm "$targetFile" - -echo "Installing custom ICU devel packages on CentOS" - -tempDir=$(mktemp -d) - -targetFile=$(mktemp) -DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" -7z x -y -o"$tempDir" "$targetFile" - -sudo cp -a "$tempDir"/lib/* /usr/lib64 -sudo cp -a "$tempDir"/* /usr/ - -sudo rm "$targetFile" -sudo rm -fr "$tempDir" - -sudo /sbin/ldconfig - -echo "ICU = $icuVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/35-install-breakpad.sh deleted file mode 100755 index 74dd1579..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/35-install-breakpad.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -# shellcheck source=../common/unix/install-breakpad.sh -source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-android_linux.sh deleted file mode 100755 index a6c4dfff..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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 - -# shellcheck source=../common/linux/android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-install-cmake.sh deleted file mode 100755 index 062b2790..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-install-cmake.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -# This script installs CMake 3.6.2 - -set -ex - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/linux/cmake_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/50-openssl_for_android_linux.sh deleted file mode 100755 index 6666ea15..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/50-openssl_for_android_linux.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 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 - -# shellcheck source=../common/linux/openssl_for_android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/60-install_protobuff.sh deleted file mode 100755 index a77938b3..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/60-install_protobuff.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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 - -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" - diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_QemuGA.sh deleted file mode 100755 index 0c5244c7..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_QemuGA.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -# This script installs QEMU Guest Agent - -set -ex - -sudo yum -y install qemu-guest-agent -sudo systemctl start qemu-guest-agent diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_dwz.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_dwz.sh deleted file mode 100755 index 935d9227..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_dwz.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 Konstantin Tokarev -## 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 - -sudo yum -y install elfutils-libelf-devel - -# shellcheck source=../common/linux/install_dwz.sh -source "${BASH_SOURCE%/*}/../common/linux/install_dwz.sh" - diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/90-squish.sh deleted file mode 100755 index e4281588..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/90-squish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" - diff --git a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/99-version.sh b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/99-version.sh deleted file mode 100755 index 03565da2..00000000 --- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/99-version.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2018 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$ -## -############################################################################# - -# This script needs to be called last during provisioning so that the software information will show up last in provision log. - -# Storage installed RPM packages information - -set -ex - -# shellcheck disable=SC2129 -echo "*********************************************" >> ~/versions.txt -echo "***** All installed RPM packages *****" >> ~/versions.txt -rpm -q -a | sort >> ~/versions.txt -echo "*********************************************" >> ~/versions.txt - -"$(dirname "$0")/../common/linux/version.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_network_manager_secret_key.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_network_manager_secret_key.sh new file mode 100644 index 00000000..5ed44f2d --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_network_manager_secret_key.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +# Ipv6 link local becomes tentative and dadfailed if two systems has the same secret_key +# New unique secret key will be created automatically during start up. +# https://access.redhat.com/solutions/3553581 +echo "Removing secret_key" +sudo rm -f "/var/lib/NetworkManager/secret_key" + + diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_stable-privacy.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_stable-privacy.sh new file mode 100644 index 00000000..5fdf5804 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-remove_stable-privacy.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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 + +echo "Change default stable-secret to based on MAC" +sudo sed -i '/^IPV6_ADDR_GEN_MODE/d' "/etc/sysconfig/network-scripts/ifcfg-ens192" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..6d31a941 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh @@ -0,0 +1,54 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" + +echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" +echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +echo "Set DISPLAY" +echo 'export DISPLAY=":0"' >> ~/.bashrc +# for current session +export DISPLAY=:0 + +# Set timezone to UTC. +sudo timedatectl set-timezone Etc/UTC +# disable Automatic screen lock +gsettings set org.gnome.desktop.screensaver lock-enabled false +# disable blank screen power saving +gsettings set org.gnome.desktop.session idle-delay 0 diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-enable-repos.sh new file mode 100755 index 00000000..b5db7675 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-enable-repos.sh @@ -0,0 +1,84 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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 + +sudo rm -f /etc/yum.repos.d/*.repo + +sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <> ~/versions.txt + diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-p7zip.sh new file mode 100755 index 00000000..45565766 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-p7zip.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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 + +name="p7zip" +version="7-11" +sudo yum -y install "$name" + +# Link 7za to 7z so we can use existing installation scripts +sudo ln -s /usr/bin/7za /usr/bin/7z + +echo "$name = $version" >> ~/versions.txt + diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang-v100-dyn.sh new file mode 100755 index 00000000..fbf34ddd --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang.sh new file mode 100755 index 00000000..7074cbc1 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/05-libclang.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh new file mode 100755 index 00000000..92c741fb --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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 + +# shellcheck source=../common/linux/qnx_700.sh +source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/08-integrity.sh new file mode 100755 index 00000000..154370da --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/08-integrity.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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 + +# shellcheck source=../common/linux/integrity.sh +source "${BASH_SOURCE%/*}/../common/linux/integrity.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/09-disable_selinux.sh new file mode 100755 index 00000000..b7a53cd4 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/09-disable_selinux.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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 + +# shellcheck source=../common/linux/disable_selinux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/20-sccache.sh new file mode 100755 index 00000000..b371d947 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..e677427f --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/22-mqtt_broker.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-fbx.sh new file mode 100755 index 00000000..d8df4375 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-fbx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh new file mode 100755 index 00000000..ec54fa54 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-conan.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install-conan.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install_icu.sh new file mode 100755 index 00000000..ce42e844 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install_icu.sh @@ -0,0 +1,76 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +# This script will install ICU + +icuVersion="56.1" +icuLocation="/usr/lib64" +sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z" + +sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864" +develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z" + +echo "Installing custom ICU $icuVersion $sha1 packages on CentOS to $icuLocation" + +targetFile=$(mktemp) +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" +sudo 7z x -y -o/usr/lib64 "$targetFile" +sudo rm "$targetFile" + +echo "Installing custom ICU devel packages on CentOS" + +tempDir=$(mktemp -d) + +targetFile=$(mktemp) +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" +7z x -y -o"$tempDir" "$targetFile" + +sudo cp -a "$tempDir"/lib/* /usr/lib64 +sudo cp -a "$tempDir"/* /usr/ + +sudo rm "$targetFile" +sudo rm -fr "$tempDir" + +sudo /sbin/ldconfig + +echo "ICU = $icuVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/35-install-breakpad.sh new file mode 100755 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/35-install-breakpad.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-android_linux.sh new file mode 100755 index 00000000..a6c4dfff --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-android_linux.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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 + +# shellcheck source=../common/linux/android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-install-cmake.sh new file mode 100755 index 00000000..062b2790 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/40-install-cmake.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +set -ex + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/linux/cmake_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..6666ea15 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/50-openssl_for_android_linux.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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 + +# shellcheck source=../common/linux/openssl_for_android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh new file mode 100755 index 00000000..a77938b3 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/60-install_protobuff.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_QemuGA.sh new file mode 100755 index 00000000..0c5244c7 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_QemuGA.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 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$ +## +############################################################################# + +# This script installs QEMU Guest Agent + +set -ex + +sudo yum -y install qemu-guest-agent +sudo systemctl start qemu-guest-agent diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_dwz.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_dwz.sh new file mode 100755 index 00000000..935d9227 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/70-install_dwz.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 Konstantin Tokarev +## 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 + +sudo yum -y install elfutils-libelf-devel + +# shellcheck source=../common/linux/install_dwz.sh +source "${BASH_SOURCE%/*}/../common/linux/install_dwz.sh" + diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-version.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-version.sh new file mode 100755 index 00000000..03565da2 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-version.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +# This script needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information + +set -ex + +# shellcheck disable=SC2129 +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/../common/linux/version.sh" -- cgit v1.2.3 From ca70f218e093ade33af1c510bd7c2239e5614582 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 1 Feb 2021 18:46:44 +0200 Subject: Update submodules on 'dev' in qt/qt5 Change-Id: I2b24cd357a952ae173719dc12566c7eaf27fb219 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtrepotools | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt5compat b/qt5compat index 1d5d02c3..8228a999 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 1d5d02c3cad66d36cfde352044666c2d88055771 +Subproject commit 8228a999c79c244eb361bd1259bede49f394b853 diff --git a/qtbase b/qtbase index 167bcafc..a1a2d97e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 167bcafcb6b1988047bec8b4d67c994fc8c85c14 +Subproject commit a1a2d97e34eb7e2445877cf9e557db55a3540f9d diff --git a/qtdeclarative b/qtdeclarative index 948c56ca..f5877880 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 948c56ca051d9a2d0f806b8bce3a3170751f5750 +Subproject commit f5877880c5596f953a8beee62a91c4e1a2b8a510 diff --git a/qtdoc b/qtdoc index f463b26f..fc7c97cc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f463b26f9329cc0fa673fdfdcb8f52986b66f099 +Subproject commit fc7c97cc922e1efbb5df64aa047fde2cf243f089 diff --git a/qtqa b/qtqa index 0cb86ebe..57d64d0b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0cb86ebe6e412685e9323d311fd301cfcbe734c4 +Subproject commit 57d64d0b57fec130c4261a975637082dec8c94e8 diff --git a/qtquick3d b/qtquick3d index 44cde9bb..be997740 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 44cde9bb144667fd57df4fadd0743a5263bff271 +Subproject commit be99774047337a41725d81e09522f884eb5cf8ab diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fd92634e..64b3c2e4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fd92634e94bf91c73696eccd8c468fc5f7a9c8e5 +Subproject commit 64b3c2e4f2cd6d3def549fb3f2ff5db8e76af62b diff --git a/qtquicktimeline b/qtquicktimeline index e0f3307b..ecfc4938 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit e0f3307bda17f739af2d5712f488f65a4f30af9e +Subproject commit ecfc493839160a67b217a06bd20e8d9383e7513f diff --git a/qtrepotools b/qtrepotools index 7efc56e5..a829867f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7efc56e59dfd7cc300f92e3c3e7744202fd7b021 +Subproject commit a829867f0873227451099d77597706b5efb5ed10 diff --git a/qtshadertools b/qtshadertools index 2d6cb852..be9bcf37 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 2d6cb8528ae104df7fffe22c20b92299a4119a87 +Subproject commit be9bcf37dabb605321d8e099f5372ec205740db0 diff --git a/qtsvg b/qtsvg index 0b7ba19d..4f09285b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0b7ba19d5df00a756c99fb4dc2aecd2262c82ea0 +Subproject commit 4f09285bc20153dda95ea05eb473477a1abc6575 diff --git a/qttools b/qttools index d0607c4c..df4d70d9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d0607c4ca2388df8e81392396884d9a108e0443d +Subproject commit df4d70d987af274e594eca784dc96c85c436f123 diff --git a/qttranslations b/qttranslations index b830cea5..775378ec 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b830cea5594ad80c3f6528ba4fccbc855378b3a6 +Subproject commit 775378ecd92b5f4b0704a59baa4b539fccbfe16d diff --git a/qtwayland b/qtwayland index 4d0e2b65..b3684a9d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4d0e2b65a0696e4c045939216a023108cb439e14 +Subproject commit b3684a9d1593f7424c383edfd10bb8d2e4398322 -- cgit v1.2.3 From c45c7617f6e06067cd8f5dc01fef2dda8cbc3ac4 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Fri, 15 Jan 2021 14:45:58 +0100 Subject: Fix missing .qch files when building documentation in the CI We need to build the target "docs", not "generate_docs". The latter only creates html documentation. Creating .qch files is done with qhelpgenerator, and qhelpgenerator needs proper platform plugins and the sqlite plugin. To keep things simple, we build all the platform plugins and SQL plugins. Fixes: COIN-659 Change-Id: Ief8f71f27836e7667e3a96e0b2654bdd45647ed4 Reviewed-by: Toni Saario --- coin/module_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 78e2b84e..d73063c4 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -24,13 +24,13 @@ instructions: - type: Group instructions: - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --target qttools/all --parallel -v" + command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v" maxTimeInSeconds: 12000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > Failed to build sources. - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build . --target generate_docs -v" + command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v" maxTimeInSeconds: 12000 maxTimeBetweenOutput: 1200 userMessageOnFailure: > -- cgit v1.2.3 From d86303a561a0179003802b9591ae8b7690033d16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Mon, 25 Jan 2021 13:04:06 +0200 Subject: Provisioning: Update Squish for Qt6 These are snapshot packages from Froglogic, not available for macOS yet, thus it will still use Qt5.15 based Squish. Only Linux and Win packages are updated now. Along with the Squish for Qt6 we need the Squish for Qt5 to be able to run Creator tests (since Creator is still Qt5 based). Change-Id: Iec0294e1de036db004633ee6b95e1e68a6dd23a5 Pick-to: 6.0 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/squishInstall.sh | 44 +++++++++++++++------- coin/provisioning/common/windows/squishInstall.ps1 | 8 ++-- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 04ce9b93..327c8af5 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,19 +41,20 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.6.1" -qtBranch="515x" +version="6.7-20210119-1632" +qtBranch="60x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" -licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + version="6.6.1" + compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz" sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="3a50052caafa3ca583b7edf754227999d7185ffa" + sha1="8780665c3560456cd86980802cb24513233444fe" fi mountFolder="/tmp/squish" @@ -100,7 +101,8 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder" if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then sudo mkdir /usr/lib/tcl8.6 - sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ + #this needs to be copied only to squish_for_qt6 + sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi fi @@ -112,18 +114,34 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile else echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc fi -echo "Verifying Squish" -if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish for Qt installation tested successfully" +echo "Verifying Squish, available installations:" +ls -la $squishFolder +if uname -a |grep -q Darwin; then + if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt installation tested successfully" + else + echo "Squish for Qt test failed! Package wasn't installed correctly." + exit 1 + fi else - echo "Squish for Qt test failed! Package wasn't installed correctly." - exit 1 + if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt5 installation tested successfully" + else + echo "Squish for Qt5 test failed! Package wasn't installed correctly." + exit 1 + fi + if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt6 installation tested successfully" + else + echo "Squish for Qt6 test failed! Package wasn't installed correctly." + exit 1 + fi fi diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c615f9eb..dbd6da16 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,12 +36,12 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.6.1" -$qtBranch = "515x" +$version = "6.7-20210112-1612" +$qtBranch = "60x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x" # Squish license $licensePackage = ".squish-3-license" @@ -60,7 +60,7 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" + $sha1 = "628bb65cf515d08df388b0dc4d5b403e4c6657b2" } else { $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild -- cgit v1.2.3 From ab4da065ec9588aba07028932b359d87787e75b7 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 3 Feb 2021 12:52:19 +0200 Subject: Adjust submodule branches Change-Id: I10b499d2ec2a30cc7cb8d34b272d1c0a2725076c --- .gitmodules | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index 06f685c4..ef03efec 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,20 +1,20 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 6.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 6.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 6.1 status = essential [submodule "qtactiveqt"] depends = qtbase @@ -34,7 +34,7 @@ recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 6.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -47,7 +47,7 @@ depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 6.1 status = essential priority = 30 [submodule "qtdoc"] @@ -55,7 +55,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = dev + branch = 6.1 status = essential priority = 40 [submodule "qtrepotools"] @@ -117,7 +117,7 @@ recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 6.1 status = addon [submodule "qt3d"] depends = qtbase @@ -223,7 +223,7 @@ recommends = qtimageformats qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 6.1 status = essential [submodule "qtpurchasing"] depends = qtbase @@ -303,23 +303,23 @@ depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = dev + branch = 6.1 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative qtshadertools path = qtquick3d url = ../qtquick3d.git - branch = dev + branch = 6.1 status = addon [submodule "qtshadertools"] depends = qtbase path = qtshadertools url = ../qtshadertools.git - branch = dev + branch = 6.1 status = addon [submodule "qt5compat"] depends = qtbase qtdeclarative path = qt5compat url = ../qt5compat.git - branch = dev + branch = 6.1 status = deprecated -- cgit v1.2.3 From f4fe2443925b438c34874e0db9e83be575a30a8e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 2 Feb 2021 14:11:03 +0200 Subject: Provisioning: Disable multicast advertisements To get rid of the computer name notification multicat advertisements needs to be disabled. This notification seems to affect to autotest by causing misleading failures. Task-number: QTBUG-89746 Change-Id: I2365092ee05cc731b78e17c56eee7c4370a9f0a7 Reviewed-by: Toni Saario (cherry picked from commit a3c798e76a8cc9c6b4dfc3c178b45f0a294ecf77) Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh | 4 +++- coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh index aed78aee..1195f95a 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## 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. @@ -104,3 +104,5 @@ sudo rm -f "$targetFile" sudo sed -i'.orig' -e 's:^#/net:/net:' -e 's:hidefromfinder,nosuid:hidefromfinder,nosuid,locallocks,nocallback:' /etc/auto_master sudo automount -cv +# Disable multicast advertisements +sudo defaults write /Library/Preferences/com.apple.mDNSResponder.plist NoMulticastAdvertisements -bool true diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh index aed78aee..1195f95a 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## 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. @@ -104,3 +104,5 @@ sudo rm -f "$targetFile" sudo sed -i'.orig' -e 's:^#/net:/net:' -e 's:hidefromfinder,nosuid:hidefromfinder,nosuid,locallocks,nocallback:' /etc/auto_master sudo automount -cv +# Disable multicast advertisements +sudo defaults write /Library/Preferences/com.apple.mDNSResponder.plist NoMulticastAdvertisements -bool true -- cgit v1.2.3 From efb6f87cf645df763b9521260ff247d86b763ddb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Feb 2021 18:52:05 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: If25bdba5bbc85398523a3e648b6968be40baacfb Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index a1a2d97e..69912c67 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a1a2d97e34eb7e2445877cf9e557db55a3540f9d +Subproject commit 69912c671bc6424e5f1628327238b1ba1e04d60c diff --git a/qtdeclarative b/qtdeclarative index f5877880..7f3f9b4f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f5877880c5596f953a8beee62a91c4e1a2b8a510 +Subproject commit 7f3f9b4fdb4d760444d3a5f88a7c0a6d18aa475f diff --git a/qtdoc b/qtdoc index fc7c97cc..85392781 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit fc7c97cc922e1efbb5df64aa047fde2cf243f089 +Subproject commit 85392781093d06cb1d5ccaf4a0c8594c603be408 diff --git a/qtqa b/qtqa index 57d64d0b..4f7f6df3 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 57d64d0b57fec130c4261a975637082dec8c94e8 +Subproject commit 4f7f6df336fe7934c8a8d9461f23bf036522da2c diff --git a/qtquick3d b/qtquick3d index be997740..439bd51e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit be99774047337a41725d81e09522f884eb5cf8ab +Subproject commit 439bd51ec099eec39ba2c1f9d52a80b66cdedcd9 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 64b3c2e4..a0fbc1bf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 64b3c2e4f2cd6d3def549fb3f2ff5db8e76af62b +Subproject commit a0fbc1bfc9c0a1821db232621b5cd6522fd0cf50 diff --git a/qtquicktimeline b/qtquicktimeline index ecfc4938..dc2e15c4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ecfc493839160a67b217a06bd20e8d9383e7513f +Subproject commit dc2e15c4cfe014d5af705e11c1095d08f13b6956 diff --git a/qtshadertools b/qtshadertools index be9bcf37..7000e34b 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit be9bcf37dabb605321d8e099f5372ec205740db0 +Subproject commit 7000e34b4292f82352c09d7f059b14e35943aa1e diff --git a/qtsvg b/qtsvg index 4f09285b..74d802a1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4f09285bc20153dda95ea05eb473477a1abc6575 +Subproject commit 74d802a15ee1c483410559c8df90eaf34d58b581 diff --git a/qttools b/qttools index df4d70d9..9fbfa182 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit df4d70d987af274e594eca784dc96c85c436f123 +Subproject commit 9fbfa1824b87210de16ea7057cd535846b2c1bf4 diff --git a/qttranslations b/qttranslations index 775378ec..00f36825 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 775378ecd92b5f4b0704a59baa4b539fccbfe16d +Subproject commit 00f3682506f4c49dfdf5e735df414eb9aecb1ebf diff --git a/qtwayland b/qtwayland index b3684a9d..42d52171 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b3684a9d1593f7424c383edfd10bb8d2e4398322 +Subproject commit 42d52171b34c05fd8cb780e3541783072492c467 -- cgit v1.2.3 From 4e3b53f22838c194ca74cf0e2309e36d51563e13 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 20 Oct 2020 22:54:58 +0200 Subject: Update QDoc libclang to 11.0 Change-Id: I1cc74a1efb702d32d99749ec681e37345579c5b7 Reviewed-by: Paul Wicking (cherry picked from commit d3406fedd1d373cda78afb84b69b7077c3be8029) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/libclang.sh | 15 ++++++++++----- coin/provisioning/common/windows/libclang.ps1 | 12 ++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 1c9f1597..a1ec670f 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -47,18 +47,23 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # shellcheck source=./DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" -libclang_version=10.0 +libclang_version=11.0 if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-mac.7z" url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z" - sha1="6e019c428511e74c5d46d0ddca79d8e804b67f8a" + sha1="2ea23914089df532385a527861feb010a867000b" +elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat"; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z" + sha1="eeb9b9bed81308cc4c7a7ac177e15baec7214d5e" else version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z" - sha1="08f352d411e4b47c2a259c3b120d7cb2db01e41d" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" + url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" + sha1="57ebaac89bbe51a661f31a13c5e3829e34aa8b80" fi zip="/tmp/libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 676a7d25..2aa72ba8 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -5,7 +5,7 @@ param( ) . "$PSScriptRoot\helpers.ps1" -$libclang_version="10.0" +$libclang_version="11.0" Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -39,20 +39,20 @@ $toolchainSuffix = "" if ( $toolchain -eq "vs2019" ) { if ( $archVer -eq 64 ) { - $sha1 = "6e1b3e6d38803a3bf088e521f4f4feb1ca44bac3" + $sha1 = "ff0a30c881691068c14fbed9239b3583c8c45c6a" } else { - $sha1 = "36fcdc3155eef3636d99ed591f12e73d7a9a2e0c" + $sha1 = "" } $toolchainSuffix = "msvc" } if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "34daf2324d190de49f8e4005afeb39a7d70c5842" + $sha1 = "40141a788b1ccb615544e18da27cd95b4986217b" } else { - $sha1 = "3d7c809ab12c9293df8ffd9343cee68f184c8612" + $sha1 = "" } $toolchainSuffix = "mingw" } @@ -64,7 +64,7 @@ if ( $setDefault ) { } Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer") -if ( $libclang_version -eq "100" ) { +if ( $libclang_version -eq "110" ) { # This is a hacked static build of libclang which requires special # handling on the qdoc side. Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1" -- cgit v1.2.3 From d2f01f17c2d501650189ba3fa316e0fc79175f2a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 6 Feb 2021 00:55:32 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Iff46060a156725633eab3587daeb419f121900db Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 69912c67..86524935 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 69912c671bc6424e5f1628327238b1ba1e04d60c +Subproject commit 8652493529a46a375c11bbaf16d2122ee8466c29 diff --git a/qtdeclarative b/qtdeclarative index 7f3f9b4f..fcd997d3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7f3f9b4fdb4d760444d3a5f88a7c0a6d18aa475f +Subproject commit fcd997d3952780c16f5be4f3bfa55f0fbfc7beb6 diff --git a/qtdoc b/qtdoc index 85392781..e5b187d1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 85392781093d06cb1d5ccaf4a0c8594c603be408 +Subproject commit e5b187d1fe6673597ba0a77e2aa25b9a5682acee diff --git a/qtquick3d b/qtquick3d index 439bd51e..41c4bdca 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 439bd51ec099eec39ba2c1f9d52a80b66cdedcd9 +Subproject commit 41c4bdca05d4be8a4acefaaa0bd2328a05922e47 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a0fbc1bf..c20ee0f2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a0fbc1bfc9c0a1821db232621b5cd6522fd0cf50 +Subproject commit c20ee0f2f9118014357bf0b560fbb975fa01728f diff --git a/qtquicktimeline b/qtquicktimeline index dc2e15c4..710b98ba 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit dc2e15c4cfe014d5af705e11c1095d08f13b6956 +Subproject commit 710b98bad97493407b58b8973687279647bf7bfd diff --git a/qtshadertools b/qtshadertools index 7000e34b..ac913760 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7000e34b4292f82352c09d7f059b14e35943aa1e +Subproject commit ac91376052d641513ffbe3a1667336b4eb1ba16d diff --git a/qtsvg b/qtsvg index 74d802a1..9c3c89a9 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 74d802a15ee1c483410559c8df90eaf34d58b581 +Subproject commit 9c3c89a90761a94039eb0dc63e3aa054c05a7d42 diff --git a/qttools b/qttools index 9fbfa182..7462c240 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9fbfa1824b87210de16ea7057cd535846b2c1bf4 +Subproject commit 7462c240cffa45d4a9482838f0114ae5ffd3c630 diff --git a/qttranslations b/qttranslations index 00f36825..92a9d961 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 00f3682506f4c49dfdf5e735df414eb9aecb1ebf +Subproject commit 92a9d961501e3fe0d4c41c6461b517f1752505c1 diff --git a/qtwayland b/qtwayland index 42d52171..144a1abe 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 42d52171b34c05fd8cb780e3541783072492c467 +Subproject commit 144a1abe21bea76b6b7b3d502cbdf34f46ecf984 -- cgit v1.2.3 From 124aba8e7a0df3a35d3eabd58d9cc866b1082908 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 6 Feb 2021 07:45:11 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I3c6b9da8f7abaebd829d1bd4d8e836e0f72d2bdd Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 86524935..80cc01ae 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8652493529a46a375c11bbaf16d2122ee8466c29 +Subproject commit 80cc01aeb5fcc81906308c45e5bac1079c5ef905 diff --git a/qtdeclarative b/qtdeclarative index fcd997d3..cc837fb9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fcd997d3952780c16f5be4f3bfa55f0fbfc7beb6 +Subproject commit cc837fb964db89e0fa3d65958d666d604cd959c7 diff --git a/qtdoc b/qtdoc index e5b187d1..47cb7b0d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e5b187d1fe6673597ba0a77e2aa25b9a5682acee +Subproject commit 47cb7b0dee8e378d673dbb51b2ab45a8b9b4177f diff --git a/qtquick3d b/qtquick3d index 41c4bdca..7e93077e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 41c4bdca05d4be8a4acefaaa0bd2328a05922e47 +Subproject commit 7e93077e91c85b269815a78e02c0cb13f27d6e53 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c20ee0f2..edeac102 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c20ee0f2f9118014357bf0b560fbb975fa01728f +Subproject commit edeac102517314d2a172ab650f263fa6b00d5ccd diff --git a/qtquicktimeline b/qtquicktimeline index 710b98ba..d8f04f95 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 710b98bad97493407b58b8973687279647bf7bfd +Subproject commit d8f04f95ac7e811df562d5dcb2459d609a43204b diff --git a/qtshadertools b/qtshadertools index ac913760..de419999 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ac91376052d641513ffbe3a1667336b4eb1ba16d +Subproject commit de4199996b1ea1fae6a1e8f2bab3a368e0346011 diff --git a/qtsvg b/qtsvg index 9c3c89a9..6fd8718b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9c3c89a90761a94039eb0dc63e3aa054c05a7d42 +Subproject commit 6fd8718bd1a808e3adf6f44ef6ef2c892dbcd702 diff --git a/qttools b/qttools index 7462c240..7fda3ab7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7462c240cffa45d4a9482838f0114ae5ffd3c630 +Subproject commit 7fda3ab754adf79408e925c4224f84a2d5c04391 diff --git a/qttranslations b/qttranslations index 92a9d961..f2100129 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 92a9d961501e3fe0d4c41c6461b517f1752505c1 +Subproject commit f2100129bbf853c8ac66d4413d1b862e36fdc57e diff --git a/qtwayland b/qtwayland index 144a1abe..e93894e0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 144a1abe21bea76b6b7b3d502cbdf34f46ecf984 +Subproject commit e93894e0240a46a807df4064dd43c6663fc49d2d -- cgit v1.2.3 From bda440057939dd527f9d4f44f5075421a3dbee45 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 6 Feb 2021 12:27:57 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Id82662de9c66af00bd754a002b12673d61a483c7 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 80cc01ae..137f5518 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 80cc01aeb5fcc81906308c45e5bac1079c5ef905 +Subproject commit 137f5518b84439845aeb5d115341b32fee33bf10 diff --git a/qtdeclarative b/qtdeclarative index cc837fb9..f89ee2c9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cc837fb964db89e0fa3d65958d666d604cd959c7 +Subproject commit f89ee2c9aeea725aee137a76347479d2f0daaf21 diff --git a/qtdoc b/qtdoc index 47cb7b0d..22ef9f04 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 47cb7b0dee8e378d673dbb51b2ab45a8b9b4177f +Subproject commit 22ef9f04f537e6226e9faf6e88a6e8b2e8b9dd80 diff --git a/qtquick3d b/qtquick3d index 7e93077e..23355f62 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 7e93077e91c85b269815a78e02c0cb13f27d6e53 +Subproject commit 23355f6289cb52db42a3cbd96cbe245473105772 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index edeac102..0763efac 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit edeac102517314d2a172ab650f263fa6b00d5ccd +Subproject commit 0763efacdfa6fadeafc0141681b5b26bb27e7b97 diff --git a/qtquicktimeline b/qtquicktimeline index d8f04f95..73d4e682 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit d8f04f95ac7e811df562d5dcb2459d609a43204b +Subproject commit 73d4e682a4814986e7abbe24ba80e48a0978bf91 diff --git a/qtshadertools b/qtshadertools index de419999..78aa9554 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit de4199996b1ea1fae6a1e8f2bab3a368e0346011 +Subproject commit 78aa9554968cc15f89c42eaa2a89ae14190811ed diff --git a/qtsvg b/qtsvg index 6fd8718b..72a60fbb 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6fd8718bd1a808e3adf6f44ef6ef2c892dbcd702 +Subproject commit 72a60fbbaef2487aeb2c749234788a32b1651bf6 diff --git a/qttools b/qttools index 7fda3ab7..88404972 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7fda3ab754adf79408e925c4224f84a2d5c04391 +Subproject commit 884049722f7d186ce8dbae5820bc597d1d8bb76b diff --git a/qttranslations b/qttranslations index f2100129..24be39d3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f2100129bbf853c8ac66d4413d1b862e36fdc57e +Subproject commit 24be39d352557cdc1cda7713eb1427ae63188214 diff --git a/qtwayland b/qtwayland index e93894e0..2de9d663 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e93894e0240a46a807df4064dd43c6663fc49d2d +Subproject commit 2de9d6633d0d7f6af5d9e345b9c4acd86044bf98 -- cgit v1.2.3 From 3a8a4d2b11a5282ac7930eeae71781c4c9342340 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 27 Jan 2021 12:05:14 +0200 Subject: Add Qt 6.1.0 Additional libraries Set status to additionalLibrary to ones already in .gitmodules as ignore status Add missing ones with status = additionalLibrary Task-number: QTBUG-90669 Change-Id: I5f7518c516d10ae68fb5cf20851b36bde4fbc0b2 Reviewed-by: Toni Saario (cherry picked from commit dba2b570b962f3e62a7e7154c57da9137b8c9e42) Reviewed-by: Qt Cherry-pick Bot --- .gitmodules | 36 +++++++++++++++++++++++++++--------- qtcoap | 1 + qtmqtt | 1 + qtopcua | 1 + 4 files changed, 30 insertions(+), 9 deletions(-) create mode 160000 qtcoap create mode 160000 qtmqtt create mode 160000 qtopcua diff --git a/.gitmodules b/.gitmodules index ef03efec..ef36a140 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,7 @@ path = qtactiveqt url = ../qtactiveqt.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative @@ -125,13 +125,13 @@ path = qt3d url = ../qt3d.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -238,21 +238,21 @@ path = qtcharts url = ../qtcharts.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative @@ -265,7 +265,7 @@ path = qtscxml url = ../qtscxml.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia @@ -278,7 +278,7 @@ path = qtnetworkauth url = ../qtnetworkauth.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative @@ -298,7 +298,7 @@ path = qtlottie url = ../qtlottie.git branch = dev - status = ignore + status = additionalLibrary [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline @@ -323,3 +323,21 @@ url = ../qt5compat.git branch = 6.1 status = deprecated +[submodule "qtcoap"] + depends = qtbase qttools + path = qtcoap + url = ../qtcoap.git + branch = dev + status = additionalLibrary +[submodule "qtmqtt"] + depends = qtbase qtdeclarative qttools + path = qtmqtt + url = ../qtmqtt.git + branch = dev + status = additionalLibrary +[submodule "qtopcua"] + depends = qtbase qtdeclarative qtquickcontrols2 qttools + path = qtopcua + url = ../qtopcua.git + branch = dev + status = additionalLibrary diff --git a/qtcoap b/qtcoap new file mode 160000 index 00000000..22aa407e --- /dev/null +++ b/qtcoap @@ -0,0 +1 @@ +Subproject commit 22aa407eca1f55144474add10afc3d99288b5fd4 diff --git a/qtmqtt b/qtmqtt new file mode 160000 index 00000000..1e7bf209 --- /dev/null +++ b/qtmqtt @@ -0,0 +1 @@ +Subproject commit 1e7bf20965c832f213c6bb14ebfd447cb0039c7a diff --git a/qtopcua b/qtopcua new file mode 160000 index 00000000..32c693e7 --- /dev/null +++ b/qtopcua @@ -0,0 +1 @@ +Subproject commit 32c693e7fd3a7e4fb43ce19b33a15edfafd6572e -- cgit v1.2.3 From 0adddf1ebee197cda3e0768185e63700eff3bb8a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Feb 2021 05:45:25 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I711d62bf51d982ebe7979c9f7a0486554f93fda5 Reviewed-by: Qt Submodule Update Bot --- qtquick3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquick3d b/qtquick3d index 23355f62..bc505612 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 23355f6289cb52db42a3cbd96cbe245473105772 +Subproject commit bc5056124af68503e32c983fb5c3c131f70526f8 -- cgit v1.2.3 From b194786ec993ae51e234ba6cf38c515f9963b712 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 8 Feb 2021 08:47:45 +0200 Subject: Add qttools as additional dependency to additional libraries qttools is needed to be able to build documentation Fixes: QTBUG-90996 Change-Id: I27f101dc4294f830b9915e1530d660cfe12aeabe Reviewed-by: Toni Saario (cherry picked from commit 919aa17249c6f86e0183a356b09fe7ebbe987336) Reviewed-by: Qt Cherry-pick Bot --- .gitmodules | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index ef36a140..a856e9ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -18,6 +18,7 @@ status = essential [submodule "qtactiveqt"] depends = qtbase + recommends = qttools path = qtactiveqt url = ../qtactiveqt.git branch = dev @@ -121,13 +122,14 @@ status = addon [submodule "qt3d"] depends = qtbase - recommends = qtdeclarative qtshadertools + recommends = qtdeclarative qtshadertools qttools path = qt3d url = ../qt3d.git branch = dev status = additionalLibrary [submodule "qtimageformats"] depends = qtbase + recommends = qttools path = qtimageformats url = ../qtimageformats.git branch = dev @@ -234,21 +236,21 @@ status = ignore [submodule "qtcharts"] depends = qtbase - recommends = qtdeclarative qtmultimedia + recommends = qtdeclarative qtmultimedia qttools path = qtcharts url = ../qtcharts.git branch = dev status = additionalLibrary [submodule "qtdatavis3d"] depends = qtbase - recommends = qtdeclarative qtmultimedia + recommends = qtdeclarative qtmultimedia qttools path = qtdatavis3d url = ../qtdatavis3d.git branch = dev status = additionalLibrary [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg - recommends = qtmultimedia qtquickcontrols + recommends = qtmultimedia qtquickcontrols qttools path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev @@ -262,6 +264,7 @@ status = ignore [submodule "qtscxml"] depends = qtbase qtdeclarative + recommends = qttools path = qtscxml url = ../qtscxml.git branch = dev @@ -275,6 +278,7 @@ status = ignore [submodule "qtnetworkauth"] depends = qtbase + recommends = qttools path = qtnetworkauth url = ../qtnetworkauth.git branch = dev @@ -295,6 +299,7 @@ status = ignore [submodule "qtlottie"] depends = qtbase qtdeclarative + recommends = qttools path = qtlottie url = ../qtlottie.git branch = dev -- cgit v1.2.3 From 117bdd98673a7db6c6e8ff79745447efbff68941 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Feb 2021 11:22:28 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I1da8f5dc4d4f9311bb4e06e91fc1fa195578abaf Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 137f5518..405337ee 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 137f5518b84439845aeb5d115341b32fee33bf10 +Subproject commit 405337ee7276be4b76e86745c0694c51283b6b07 diff --git a/qtdeclarative b/qtdeclarative index f89ee2c9..0b7dddcb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f89ee2c9aeea725aee137a76347479d2f0daaf21 +Subproject commit 0b7dddcb6465ba7f08c243e8551dfcda9766b888 diff --git a/qtdoc b/qtdoc index 22ef9f04..c97552a2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 22ef9f04f537e6226e9faf6e88a6e8b2e8b9dd80 +Subproject commit c97552a2edfa969ccab1941af29eb4b978e0de3f diff --git a/qtqa b/qtqa index 4f7f6df3..e2a0aac0 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4f7f6df336fe7934c8a8d9461f23bf036522da2c +Subproject commit e2a0aac01c0f466d6c546ac01918de017c977883 diff --git a/qtquick3d b/qtquick3d index bc505612..b4543076 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit bc5056124af68503e32c983fb5c3c131f70526f8 +Subproject commit b4543076ab9b361c168ec5e5d93f9039e3fc13dc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0763efac..e420f5b1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0763efacdfa6fadeafc0141681b5b26bb27e7b97 +Subproject commit e420f5b1bdc0f293723754edde901cb00e210968 diff --git a/qtquicktimeline b/qtquicktimeline index 73d4e682..f9167abe 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 73d4e682a4814986e7abbe24ba80e48a0978bf91 +Subproject commit f9167abe122667bcb58bc8ed8d2c102399eaeed0 diff --git a/qtshadertools b/qtshadertools index 78aa9554..49f8d50f 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 78aa9554968cc15f89c42eaa2a89ae14190811ed +Subproject commit 49f8d50fef810fe02bf993118e70f646c1f2ec2e diff --git a/qtsvg b/qtsvg index 72a60fbb..bee2310a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 72a60fbbaef2487aeb2c749234788a32b1651bf6 +Subproject commit bee2310a799d30363949eb101087fb80720c5dfc diff --git a/qttools b/qttools index 88404972..de559e22 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 884049722f7d186ce8dbae5820bc597d1d8bb76b +Subproject commit de559e22043bc82a0627ef8a7e2be9d36a825ec9 diff --git a/qttranslations b/qttranslations index 24be39d3..e75ac90d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 24be39d352557cdc1cda7713eb1427ae63188214 +Subproject commit e75ac90d2d4d1e87fd9449110dac07793a48aaa0 diff --git a/qtwayland b/qtwayland index 2de9d663..d201be5d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2de9d6633d0d7f6af5d9e345b9c4acd86044bf98 +Subproject commit d201be5daddef2c3e318d29b20ceadd9a80ee90f -- cgit v1.2.3 From 4bcbf2595188b4445d9f786bcabc14ca910f1e4f Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 8 Feb 2021 12:59:02 +0100 Subject: Fix init-repository Introducing additionalLibrary to .gitmodules broke init-repository. Add the new state also here. Task-number: QTBUG-90669 Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7 Reviewed-by: Daniel Smith (cherry picked from commit 414165e36614dc0f0267df280ea892e1914f1776) Reviewed-by: Qt Cherry-pick Bot --- init-repository | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 2e0ddcde..63005fd2 100755 --- a/init-repository +++ b/init-repository @@ -294,7 +294,8 @@ use constant { STS_ESSENTIAL => 2, STS_ADDON => 3, STS_DEPRECATED => 4, - STS_OBSOLETE => 5 + STS_OBSOLETE => 5, + STS_ADDITIONAL => 6 }; sub git_clone_all_submodules @@ -332,6 +333,8 @@ sub git_clone_all_submodules $subinits{$1} = STS_DEPRECATED; } elsif ($3 eq "obsolete") { $subinits{$1} = STS_OBSOLETE; + } elsif ($3 eq "additionalLibrary") { + $subinits{$1} = STS_ADDITIONAL; } elsif ($3 eq "ignore") { delete $subinits{$1}; } else { @@ -351,6 +354,8 @@ sub git_clone_all_submodules @what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases; } elsif ($mod eq "addon") { @what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; + } elsif ($mod eq "additionalLibrary") { + @what = grep { ($subinits{$_} || 0) eq STS_ADDITIONAL } keys %subbases; } elsif ($mod eq "preview") { @what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; } elsif ($mod eq "deprecated") { -- cgit v1.2.3 From e0fcf126c6f24ff242cd3872318bab0c66e45a19 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Feb 2021 10:00:50 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Ib3b6d409bb7ee45e8a5b61a6ff10a02130476f32 Reviewed-by: Qt Submodule Update Bot --- qtquick3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquick3d b/qtquick3d index b4543076..f0f8c1bf 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b4543076ab9b361c168ec5e5d93f9039e3fc13dc +Subproject commit f0f8c1bffd2a1460ab05cf9d915d016ff7856920 -- cgit v1.2.3 From df50ad42741b52227f09e19dcd5492fb2d76e1dc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Feb 2021 17:59:36 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I31deb28cbc9602d368abe540141982539833f8b7 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 405337ee..27337fe2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 405337ee7276be4b76e86745c0694c51283b6b07 +Subproject commit 27337fe242d9afe88efff371800ce83f3db9f875 diff --git a/qtdeclarative b/qtdeclarative index 0b7dddcb..3ae21434 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0b7dddcb6465ba7f08c243e8551dfcda9766b888 +Subproject commit 3ae21434cebac9b4c869470d663fe8a04d148157 diff --git a/qtdoc b/qtdoc index c97552a2..2d17a274 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c97552a2edfa969ccab1941af29eb4b978e0de3f +Subproject commit 2d17a274c2375671bcde86a55668734e6f6d80d1 diff --git a/qtqa b/qtqa index e2a0aac0..7b2bca1a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e2a0aac01c0f466d6c546ac01918de017c977883 +Subproject commit 7b2bca1aaba0a9aeb9f6802ab41958138b2cc805 diff --git a/qtquick3d b/qtquick3d index f0f8c1bf..aecf314f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit f0f8c1bffd2a1460ab05cf9d915d016ff7856920 +Subproject commit aecf314fffbfd899c0d0e2b09b09b2235949be06 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e420f5b1..1d4edeaf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e420f5b1bdc0f293723754edde901cb00e210968 +Subproject commit 1d4edeaf40f53e5335fd9ff3a009db839e638c29 diff --git a/qtquicktimeline b/qtquicktimeline index f9167abe..8c7a0572 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit f9167abe122667bcb58bc8ed8d2c102399eaeed0 +Subproject commit 8c7a05720d225e88d8c4b7fa5ce2a7e024255cf5 diff --git a/qtshadertools b/qtshadertools index 49f8d50f..e5f4c383 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 49f8d50fef810fe02bf993118e70f646c1f2ec2e +Subproject commit e5f4c383b0332650cafd94ad251186649d520039 diff --git a/qtsvg b/qtsvg index bee2310a..ac8b06d8 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bee2310a799d30363949eb101087fb80720c5dfc +Subproject commit ac8b06d857e08ab38b9569c9123d60f550c10031 diff --git a/qttools b/qttools index de559e22..db72193b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit de559e22043bc82a0627ef8a7e2be9d36a825ec9 +Subproject commit db72193b76c78cac941310d35bfe1496b21981d9 diff --git a/qttranslations b/qttranslations index e75ac90d..d989bcca 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e75ac90d2d4d1e87fd9449110dac07793a48aaa0 +Subproject commit d989bcca911b6e0c4aa0f613b83cee99f8a7d999 diff --git a/qtwayland b/qtwayland index d201be5d..4c82a8a5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d201be5daddef2c3e318d29b20ceadd9a80ee90f +Subproject commit 4c82a8a520d95b57eb7fb3a5085c8bb914712c7a -- cgit v1.2.3 From e2c6b9e58125e7e8cd1b035717c5499e31f1dbfc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Feb 2021 01:22:26 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Ic63a405cbe79572d297ca61bf21564c5b31c1420 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 27337fe2..9fc6a909 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 27337fe242d9afe88efff371800ce83f3db9f875 +Subproject commit 9fc6a9099e2fe97d3e7490418823bc4527250ac7 diff --git a/qtdeclarative b/qtdeclarative index 3ae21434..6544b8bd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3ae21434cebac9b4c869470d663fe8a04d148157 +Subproject commit 6544b8bd8fa1b5e843ebe41723fe578aba3092ae diff --git a/qtdoc b/qtdoc index 2d17a274..856edcea 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2d17a274c2375671bcde86a55668734e6f6d80d1 +Subproject commit 856edcea1ff613d61a99b625e2aa56ea10182cb8 diff --git a/qtqa b/qtqa index 7b2bca1a..606ce770 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7b2bca1aaba0a9aeb9f6802ab41958138b2cc805 +Subproject commit 606ce77002931224aa5f69b5bfe8d8d897d0b787 diff --git a/qtquick3d b/qtquick3d index aecf314f..d307517a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit aecf314fffbfd899c0d0e2b09b09b2235949be06 +Subproject commit d307517aad300876b9ab8751e86f2e9b91327221 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1d4edeaf..cc8fcd43 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1d4edeaf40f53e5335fd9ff3a009db839e638c29 +Subproject commit cc8fcd4369b5bc49f9955c2763fd62c350f8148d diff --git a/qtquicktimeline b/qtquicktimeline index 8c7a0572..aedccdd4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 8c7a05720d225e88d8c4b7fa5ce2a7e024255cf5 +Subproject commit aedccdd4e405ce5ecfae0cba9b3f755e1f03a843 diff --git a/qtshadertools b/qtshadertools index e5f4c383..ac75c9bb 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit e5f4c383b0332650cafd94ad251186649d520039 +Subproject commit ac75c9bb84a7ff39397f8a6c7d0dfa27f7c317b7 diff --git a/qtsvg b/qtsvg index ac8b06d8..b13ccba3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ac8b06d857e08ab38b9569c9123d60f550c10031 +Subproject commit b13ccba3a9b3d67d5fa4dfebb59d310e9dc9696c diff --git a/qttools b/qttools index db72193b..b97031f7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit db72193b76c78cac941310d35bfe1496b21981d9 +Subproject commit b97031f704775774bc63054b7e4a4478ab8d7f68 diff --git a/qttranslations b/qttranslations index d989bcca..1cef726c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d989bcca911b6e0c4aa0f613b83cee99f8a7d999 +Subproject commit 1cef726c11846680d537818b9e1e183f22b05c13 diff --git a/qtwayland b/qtwayland index 4c82a8a5..b82fdbaa 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4c82a8a520d95b57eb7fb3a5085c8bb914712c7a +Subproject commit b82fdbaafad51140284e754e239722274e14f154 -- cgit v1.2.3 From ae0eb06a3adf2390fa8bf685310a0ccea00e0d19 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Feb 2021 05:51:40 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Ic463cd82a0016324d528f9e2814f4858045e8067 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 9fc6a909..77b035aa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9fc6a9099e2fe97d3e7490418823bc4527250ac7 +Subproject commit 77b035aa6e73ce317242a21f181a8e5849a36bee diff --git a/qtdeclarative b/qtdeclarative index 6544b8bd..15f5c95d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6544b8bd8fa1b5e843ebe41723fe578aba3092ae +Subproject commit 15f5c95da300ed9b3aa417b9ba0612b273d240d9 diff --git a/qtdoc b/qtdoc index 856edcea..3ff31afe 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 856edcea1ff613d61a99b625e2aa56ea10182cb8 +Subproject commit 3ff31afe1d03b4fb96dc87b79e148f9b54cb37d5 diff --git a/qtqa b/qtqa index 606ce770..98f6529e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 606ce77002931224aa5f69b5bfe8d8d897d0b787 +Subproject commit 98f6529e548cad6c6a6e2d0490ad45227198d95b diff --git a/qtquick3d b/qtquick3d index d307517a..2ddf66ca 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit d307517aad300876b9ab8751e86f2e9b91327221 +Subproject commit 2ddf66ca693d5a8e8eafdc4ddca89d9dc24d003c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index cc8fcd43..59128d30 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit cc8fcd4369b5bc49f9955c2763fd62c350f8148d +Subproject commit 59128d3058c87d3bb044becbdef24d559af0debe diff --git a/qtquicktimeline b/qtquicktimeline index aedccdd4..ece7b667 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit aedccdd4e405ce5ecfae0cba9b3f755e1f03a843 +Subproject commit ece7b667bb8f8c96911e1fc2d34dfa0579849389 diff --git a/qtshadertools b/qtshadertools index ac75c9bb..b5d39b0e 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ac75c9bb84a7ff39397f8a6c7d0dfa27f7c317b7 +Subproject commit b5d39b0e2a7cb398fecfa5d24c03635101c9f858 diff --git a/qtsvg b/qtsvg index b13ccba3..d46c3350 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b13ccba3a9b3d67d5fa4dfebb59d310e9dc9696c +Subproject commit d46c3350d1aaf81267839c23efe21543fba09e0d diff --git a/qttools b/qttools index b97031f7..b89682dd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b97031f704775774bc63054b7e4a4478ab8d7f68 +Subproject commit b89682dd0c3859ec619ea198df496b1b66964a94 diff --git a/qttranslations b/qttranslations index 1cef726c..5160d3c1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1cef726c11846680d537818b9e1e183f22b05c13 +Subproject commit 5160d3c1f547e6165e913f9f9cfa73aef91f8577 diff --git a/qtwayland b/qtwayland index b82fdbaa..43fab7a6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b82fdbaafad51140284e754e239722274e14f154 +Subproject commit 43fab7a6e19db6811f463c9535d98a18495eedab -- cgit v1.2.3 From 7b7ab4088c7fd997d0ed6a60fe25fbf07870b2ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Feb 2021 10:55:43 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I3545876e137c8f638e3d0ebaaa74d121d8fe2539 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 77b035aa..4f2f53dd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 77b035aa6e73ce317242a21f181a8e5849a36bee +Subproject commit 4f2f53dd7f4291976a66f821af25d32becb02345 diff --git a/qtdeclarative b/qtdeclarative index 15f5c95d..16a09446 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 15f5c95da300ed9b3aa417b9ba0612b273d240d9 +Subproject commit 16a09446677b196bd763b54dc5e2b46afaf5add5 diff --git a/qtdoc b/qtdoc index 3ff31afe..7385f006 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3ff31afe1d03b4fb96dc87b79e148f9b54cb37d5 +Subproject commit 7385f0067b4cfdc3958f4e788ff7c1dadb80785f diff --git a/qtqa b/qtqa index 98f6529e..0da6281a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 98f6529e548cad6c6a6e2d0490ad45227198d95b +Subproject commit 0da6281a0906195ed5035ce9e136c1240c002666 diff --git a/qtquick3d b/qtquick3d index 2ddf66ca..40217aa3 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2ddf66ca693d5a8e8eafdc4ddca89d9dc24d003c +Subproject commit 40217aa34c1daca596d20e19efb811f003fd314e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 59128d30..80e2656f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 59128d3058c87d3bb044becbdef24d559af0debe +Subproject commit 80e2656f566d36dbf2ba99c6c8689bb5c5ad8fce diff --git a/qtquicktimeline b/qtquicktimeline index ece7b667..c36d9005 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ece7b667bb8f8c96911e1fc2d34dfa0579849389 +Subproject commit c36d90054f9201fde46c2b6e0269545521ecacb7 diff --git a/qtshadertools b/qtshadertools index b5d39b0e..2bdf47ce 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit b5d39b0e2a7cb398fecfa5d24c03635101c9f858 +Subproject commit 2bdf47ce0ad821386790a38127ea2e0bdc26b57c diff --git a/qtsvg b/qtsvg index d46c3350..f3325f99 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d46c3350d1aaf81267839c23efe21543fba09e0d +Subproject commit f3325f996c1d8ffa88caa7fe2e0fa378215dca9f diff --git a/qttools b/qttools index b89682dd..b3786774 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b89682dd0c3859ec619ea198df496b1b66964a94 +Subproject commit b378677430f34f9cc9c2f878027301730cba52d7 diff --git a/qttranslations b/qttranslations index 5160d3c1..d08b7fa6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 5160d3c1f547e6165e913f9f9cfa73aef91f8577 +Subproject commit d08b7fa649eb3b677310c3e5fb6f499b26368b08 diff --git a/qtwayland b/qtwayland index 43fab7a6..6a16565a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 43fab7a6e19db6811f463c9535d98a18495eedab +Subproject commit 6a16565a0505d7d2184e8686e643a9ba3eeaa530 -- cgit v1.2.3 From 7485ae59081c4a99b1ef2e676fd2973e35eb0edb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Feb 2021 11:40:14 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Ia8560e0769bf6340671487ec8fa1490686220182 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 4f2f53dd..db06e857 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f2f53dd7f4291976a66f821af25d32becb02345 +Subproject commit db06e8572259fbb16a9041129cc734a18e3946e6 diff --git a/qtdeclarative b/qtdeclarative index 16a09446..9459e9b4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 16a09446677b196bd763b54dc5e2b46afaf5add5 +Subproject commit 9459e9b4e19f266dab828edb5d2d6b88266ae079 diff --git a/qtdoc b/qtdoc index 7385f006..d4082944 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7385f0067b4cfdc3958f4e788ff7c1dadb80785f +Subproject commit d40829442d9c228ed28df427bcb7486269433b37 diff --git a/qtqa b/qtqa index 0da6281a..0dfb9986 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0da6281a0906195ed5035ce9e136c1240c002666 +Subproject commit 0dfb998663102fd372f6bc3d6f9e69b76915b1e9 diff --git a/qtquick3d b/qtquick3d index 40217aa3..99827292 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 40217aa34c1daca596d20e19efb811f003fd314e +Subproject commit 99827292247007d8cc837d0bdec3d957fb3c43da diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 80e2656f..1de9500f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 80e2656f566d36dbf2ba99c6c8689bb5c5ad8fce +Subproject commit 1de9500f9d7abf9bf6119bfe68e3a4463c0331fd diff --git a/qtquicktimeline b/qtquicktimeline index c36d9005..48d8931c 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit c36d90054f9201fde46c2b6e0269545521ecacb7 +Subproject commit 48d8931cda908f922d77ae0c6ae5c2741d54f34f diff --git a/qtshadertools b/qtshadertools index 2bdf47ce..7a929788 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 2bdf47ce0ad821386790a38127ea2e0bdc26b57c +Subproject commit 7a929788d6c35fffea1393b56b286c5e39d9ec94 diff --git a/qtsvg b/qtsvg index f3325f99..40b74bf5 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f3325f996c1d8ffa88caa7fe2e0fa378215dca9f +Subproject commit 40b74bf5e08a38eddf7cc3055361e6a4cf51abf8 diff --git a/qttools b/qttools index b3786774..746f0d98 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b378677430f34f9cc9c2f878027301730cba52d7 +Subproject commit 746f0d98bcf8e497fcdff601a74d5bb2d23db3bb diff --git a/qttranslations b/qttranslations index d08b7fa6..7525389e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d08b7fa649eb3b677310c3e5fb6f499b26368b08 +Subproject commit 7525389e744f27975f604b4a98f9ba2e5897be1f diff --git a/qtwayland b/qtwayland index 6a16565a..f8d81b31 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6a16565a0505d7d2184e8686e643a9ba3eeaa530 +Subproject commit f8d81b3102efb08d3a2ac8f35d250caa4e55ab27 -- cgit v1.2.3 From 2ae5ac5dc2352a967b5f9889e5691ea74393efc7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Feb 2021 05:45:18 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I60b7c84d66f944aebc646f8acf45b98cda796b0b Reviewed-by: Qt Submodule Update Bot --- qtquick3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquick3d b/qtquick3d index 99827292..39c55581 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 99827292247007d8cc837d0bdec3d957fb3c43da +Subproject commit 39c55581ffbaf2abfaa4de1a2cae0cd2bff2fe72 -- cgit v1.2.3 From bcad6a23df259c476379aa1711342534ae508025 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 10 Feb 2021 15:47:34 +0200 Subject: Provisioning. Set Wayland enable as false for CentOS 8.3 In CentOS 8.3 seems to be bug with setting Wayland instead of x-session. Task-number: QTQAINFRA-4246 Change-Id: I1099ca7ef5425f7383ab8a2e9988efeb42a858e8 Reviewed-by: Qt CI Bot Reviewed-by: Jani Heikkinen (cherry picked from commit ee5f8fa6cb8f181385a560d759f61e12dfbc2d62) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh index 6d31a941..0b4a7142 100755 --- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-systemsetup.sh @@ -52,3 +52,8 @@ sudo timedatectl set-timezone Etc/UTC gsettings set org.gnome.desktop.screensaver lock-enabled false # disable blank screen power saving gsettings set org.gnome.desktop.session idle-delay 0 + +# Set Wayland enable as false. CentOS may start using Wayland instead of x-session randomly if this is not set +echo "Setting Wayland enable as false" +sudo sed -i 's/#WaylandEnable=false/WaylandEnable=false/g' /etc/gdm/custom.conf + -- cgit v1.2.3 From 55b0bc23ac12e2704a1022e00e5445f5d810bb0e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Feb 2021 11:10:21 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Ifa5ede715396bf8754a15bb457950f42858b86af Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index db06e857..2c55e121 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit db06e8572259fbb16a9041129cc734a18e3946e6 +Subproject commit 2c55e121c22601d365aa353cfa39ee856770855c diff --git a/qtdeclarative b/qtdeclarative index 9459e9b4..e7695ce2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9459e9b4e19f266dab828edb5d2d6b88266ae079 +Subproject commit e7695ce2ca2e8aa29c8b689f4cdb97e8b8fa43ef diff --git a/qtdoc b/qtdoc index d4082944..cc394550 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d40829442d9c228ed28df427bcb7486269433b37 +Subproject commit cc39455017d9be47592857d5e957bdd7abf9e170 diff --git a/qtqa b/qtqa index 0dfb9986..3e4c4677 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0dfb998663102fd372f6bc3d6f9e69b76915b1e9 +Subproject commit 3e4c46779017f6cffe7384d56820b0830d1ffd1e diff --git a/qtquick3d b/qtquick3d index 39c55581..363640c6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 39c55581ffbaf2abfaa4de1a2cae0cd2bff2fe72 +Subproject commit 363640c657fbd2559c1995b3d1c08fe65e59f61e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1de9500f..ab49d333 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1de9500f9d7abf9bf6119bfe68e3a4463c0331fd +Subproject commit ab49d333726ab4649a93f08216b9a34873f3fe57 diff --git a/qtquicktimeline b/qtquicktimeline index 48d8931c..867cbb07 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 48d8931cda908f922d77ae0c6ae5c2741d54f34f +Subproject commit 867cbb07f37f90a07adbca57591897036be82118 diff --git a/qtshadertools b/qtshadertools index 7a929788..9994ae7c 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7a929788d6c35fffea1393b56b286c5e39d9ec94 +Subproject commit 9994ae7c0e5c0d724e1167e28d144039a31fe813 diff --git a/qtsvg b/qtsvg index 40b74bf5..b80bab34 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 40b74bf5e08a38eddf7cc3055361e6a4cf51abf8 +Subproject commit b80bab342072c3199e3e25187ce337e67543ffa3 diff --git a/qttools b/qttools index 746f0d98..e33fd665 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 746f0d98bcf8e497fcdff601a74d5bb2d23db3bb +Subproject commit e33fd6658e140b68774c9d1c7fa25572e7da7386 diff --git a/qttranslations b/qttranslations index 7525389e..99a03ea4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 7525389e744f27975f604b4a98f9ba2e5897be1f +Subproject commit 99a03ea4a06f6cbe91c08cbb7da4c82f4522b4c6 diff --git a/qtwayland b/qtwayland index f8d81b31..64e51ef4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f8d81b3102efb08d3a2ac8f35d250caa4e55ab27 +Subproject commit 64e51ef43fea77a7c7a525e212f172d46f530764 -- cgit v1.2.3 From 3f80dcdc05d28a8674b5ec6257a21e600ec02040 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Feb 2021 13:58:43 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I8588e8d58015c6acbac3e765a14d84692bc279c1 Reviewed-by: Qt Submodule Update Bot --- qtqa | 2 +- qtquick3d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtqa b/qtqa index 3e4c4677..2f04bfcb 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3e4c46779017f6cffe7384d56820b0830d1ffd1e +Subproject commit 2f04bfcbb9811d269d6956c1c198f61f9e344e2f diff --git a/qtquick3d b/qtquick3d index 363640c6..2913e822 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 363640c657fbd2559c1995b3d1c08fe65e59f61e +Subproject commit 2913e822d086a805eac668df012d91d0fa66eaa5 -- cgit v1.2.3 From b079c012d4f6cdfe45c0a9ad4e7eec49d4075d85 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Feb 2021 00:14:59 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I04da3b634676c2d4fa084d2b5d6d1100f65b20bb Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 2c55e121..2983fe8f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2c55e121c22601d365aa353cfa39ee856770855c +Subproject commit 2983fe8f0900778a668bc4fdaf00d38ed299b6d8 diff --git a/qtdeclarative b/qtdeclarative index e7695ce2..e33794e0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e7695ce2ca2e8aa29c8b689f4cdb97e8b8fa43ef +Subproject commit e33794e0537efbb22f9d8c4d528bfa062335da03 diff --git a/qtdoc b/qtdoc index cc394550..e79c3ba8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cc39455017d9be47592857d5e957bdd7abf9e170 +Subproject commit e79c3ba80d9327940d2adcbc19078e1f08a17e36 diff --git a/qtqa b/qtqa index 2f04bfcb..0b722414 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 2f04bfcbb9811d269d6956c1c198f61f9e344e2f +Subproject commit 0b722414421cbfe45070ce710e95604660a5315e diff --git a/qtquick3d b/qtquick3d index 2913e822..7a10645e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2913e822d086a805eac668df012d91d0fa66eaa5 +Subproject commit 7a10645e3f992bb9ff0075ab2857602f563fad69 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ab49d333..203e6f24 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ab49d333726ab4649a93f08216b9a34873f3fe57 +Subproject commit 203e6f2418918920d2eaa2453a18c978c841c78e diff --git a/qtquicktimeline b/qtquicktimeline index 867cbb07..2679bfca 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 867cbb07f37f90a07adbca57591897036be82118 +Subproject commit 2679bfca89b5c1d82db929d375e08f067dc11c97 diff --git a/qtshadertools b/qtshadertools index 9994ae7c..bc995412 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 9994ae7c0e5c0d724e1167e28d144039a31fe813 +Subproject commit bc995412a6b43bdbbaff33010c846c536ce673c1 diff --git a/qtsvg b/qtsvg index b80bab34..2504ef94 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b80bab342072c3199e3e25187ce337e67543ffa3 +Subproject commit 2504ef9424aa20de35733111b4ca1517778a9347 diff --git a/qttools b/qttools index e33fd665..baa7edaf 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e33fd6658e140b68774c9d1c7fa25572e7da7386 +Subproject commit baa7edaf55431c434129ce07e2172111e4a6cee1 diff --git a/qttranslations b/qttranslations index 99a03ea4..ccc24ef4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 99a03ea4a06f6cbe91c08cbb7da4c82f4522b4c6 +Subproject commit ccc24ef44d59f88012bee276448c158659e1b938 diff --git a/qtwayland b/qtwayland index 64e51ef4..7daea4ee 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 64e51ef43fea77a7c7a525e212f172d46f530764 +Subproject commit 7daea4ee1aadfb993046232b2c9d883b23db0974 -- cgit v1.2.3 From 6c1fe15f0f5b795e846bc43b984a49c762950e19 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Feb 2021 04:23:49 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I5a6b22fdbbca1ccff10765f4441e5bf4639f1d7f Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 2983fe8f..1803f904 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2983fe8f0900778a668bc4fdaf00d38ed299b6d8 +Subproject commit 1803f904bd4e48f9ca1430bb62cc430141380df1 diff --git a/qtdeclarative b/qtdeclarative index e33794e0..eac905ab 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e33794e0537efbb22f9d8c4d528bfa062335da03 +Subproject commit eac905abced62d918fbfcd7b932b3ae415dcf8a5 diff --git a/qtdoc b/qtdoc index e79c3ba8..7dd9dfe2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e79c3ba80d9327940d2adcbc19078e1f08a17e36 +Subproject commit 7dd9dfe267c37cf926130d60636264a3524fd996 diff --git a/qtqa b/qtqa index 0b722414..f15a9b56 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0b722414421cbfe45070ce710e95604660a5315e +Subproject commit f15a9b561ab532e08132ba0da947d7aa07752be9 diff --git a/qtquick3d b/qtquick3d index 7a10645e..acc9559a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 7a10645e3f992bb9ff0075ab2857602f563fad69 +Subproject commit acc9559aea2df5467f1b6a5153974205f7e4523f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 203e6f24..9aa0c164 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 203e6f2418918920d2eaa2453a18c978c841c78e +Subproject commit 9aa0c1648f9d9052260ce821d4c447136dd8c28c diff --git a/qtquicktimeline b/qtquicktimeline index 2679bfca..9756b4b0 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 2679bfca89b5c1d82db929d375e08f067dc11c97 +Subproject commit 9756b4b099c5c43f17ed8e2ad5552cac3b5bbb88 diff --git a/qtshadertools b/qtshadertools index bc995412..9991cc85 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit bc995412a6b43bdbbaff33010c846c536ce673c1 +Subproject commit 9991cc85ee0a92a04e1885fa7d87665dce11e8f0 diff --git a/qtsvg b/qtsvg index 2504ef94..3b703b58 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2504ef9424aa20de35733111b4ca1517778a9347 +Subproject commit 3b703b5813d4130bcc07a1f713ddb2b0001e7e94 diff --git a/qttools b/qttools index baa7edaf..b370d5d8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit baa7edaf55431c434129ce07e2172111e4a6cee1 +Subproject commit b370d5d8541ed6d8a3281c8e8656f08ac8a1d830 diff --git a/qttranslations b/qttranslations index ccc24ef4..f5a02f23 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ccc24ef44d59f88012bee276448c158659e1b938 +Subproject commit f5a02f238c301654f7cffe9d9911ca1f9dc57e29 diff --git a/qtwayland b/qtwayland index 7daea4ee..68c69886 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7daea4ee1aadfb993046232b2c9d883b23db0974 +Subproject commit 68c69886c2421b35c8e518ea8871451ee41685a2 -- cgit v1.2.3 From 61cc4367ed3570adf7e93bf1041a772f3a52346b Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 19 Jan 2021 10:12:06 +0200 Subject: Add Ubuntu 18.04 for Qt6 binary packages We need to start using Ubuntu 18.04 with Qt6 binary package targets. Ubuntu 18.04 includes older GLIBC version which shouldn't cause any problems with linux distributions supported by Qt6 Tests will be executed with Ubuntu 20.04. Task-number: QTQAINFRA-4193 Change-Id: Icb189c509351ff080a2c6431299cc0be6ba8adc1 Reviewed-by: Qt CI Bot Reviewed-by: Jani Heikkinen (cherry picked from commit b64b4b169e6319c5d10ec362ece32f835995259b) --- coin/platform_configs/cmake_platforms.yaml | 15 ++ .../cmake_platforms_target_android_host_linux.yaml | 45 +++++ coin/platform_configs/flashing-wizard.yaml | 5 + coin/platform_configs/qtbase.yaml | 11 ++ coin/platform_configs/qtsaferenderer.yaml | 5 + .../01-install_telegraf.sh | 3 + .../01-systemsetup.sh | 73 ++++++++ .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 204 +++++++++++++++++++++ .../02-disable-notifications.sh | 4 + .../02-disable-ntp.sh | 4 + .../qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh | 43 +++++ .../02-remove-apport.sh | 4 + .../02-remove-update_notifier.sh | 4 + .../qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 8 + .../04-libclang-v100-dyn.sh | 4 + .../qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh | 4 + .../qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh | 3 + .../22-mqtt_broker.sh | 39 ++++ .../qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh | 6 + .../35-install-breakpad.sh | 6 + .../40-android_linux.sh | 39 ++++ .../40-install-cmake.sh | 5 + .../50-openssl_for_android_linux.sh | 39 ++++ .../qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh | 4 + .../qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh | 4 + .../91-squish-coco.sh | 4 + .../qtci-linux-Ubuntu-18.04-x86_64/99-version.sh | 4 + .../30-install_icu.sh | 79 ++++++++ 28 files changed, 668 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang-v100-dyn.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install_icu.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index f8a90823..120daa4b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -45,6 +45,21 @@ Configurations: Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Id: 'Ubuntu-18.04-host' + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Compiler: 'GCC' + Features: ['Packaging', 'Sccache', 'DoNotRunTests'] + Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Id: 'Ubuntu-18.04-test-20.04' + Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'Sccache'] + Environment variables: ['LD_LIBRARY_PATH=/opt/icu/lib64', 'QT_PRESERVE_TESTLIB_PATH=1'] + Platform dependency: 'Ubuntu-18.04-host' - Template: 'qtci-linux-openSUSE-15.2-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml index 1df40936..1db88b9d 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml @@ -44,3 +44,48 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'armv7' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'DisableTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] + diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 21730f91..97d646de 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -17,6 +17,11 @@ Configurations: Compiler: 'GCC' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Compiler: 'GCC' + Features: ['Packaging', 'UseLegacyInstructions'] + Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 1493629a..68f47d9c 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -15,3 +15,14 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'Ubuntu-18.04-host' + Features: ['Packaging', 'Sccache', 'AndroidTestRun'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 8ba4e2dc..8edfa4b2 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -17,3 +17,8 @@ Configurations: Compiler: 'GCC' Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' + Compiler: 'GCC' + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] + Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..5198e230 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +# This script modifies system settings for automated use + +set -ex + +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +NTS_IP=10.212.2.216 + +echo "Set timezone to UTC." +sudo timedatectl set-timezone Etc/UTC +echo "Timeout for blanking the screen (0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Prevents screen lock when screesaver goes active." +gsettings set org.gnome.desktop.screensaver lock-enabled false +echo "Set grub timeout to 0" +sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo update-grub + +# https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1624320 +echo "Setting up workaround for Ubuntu systemd resolve bug" +sudo rm -f /etc/resolv.conf +sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf + +# remove hostname to get unique based on IP address +sudo rm /etc/hostname + +echo "Set Network Test Server address to $NTS_IP in /etc/hosts" +echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +echo 'LC_ALL=en_US.UTF8' | sudo tee /etc/default/locale + +if [ "$http_proxy" != "" ]; then + echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf +fi + +# This script diverts qtlogging.ini file so we don't get debugging related auto-test failures. +sudo dpkg-divert --divert /etc/xdg/QtProject/qtlogging.ini.foo --rename /etc/xdg/QtProject/qtlogging.ini diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh new file mode 100755 index 00000000..12170828 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -0,0 +1,204 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 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$ +## +############################################################################# + +# Install required packages with APT + +# shellcheck source=../common/linux/apt_wait_loop.sh +source "${BASH_SOURCE%/*}/../common/linux/apt_wait_loop.sh" + +echo "Disabling auto update" +sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic +for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do + sudo systemctl stop $service + sudo systemctl disable $service +done + +function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} + + sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe + deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse +EOC +} + +(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." + +# Git is not needed by builds themselves, but is nice to have +# immediately as one starts debugging +installPackages+=(git) +# 7zip is a needed decompressing tool +installPackages+=(p7zip-full) +# To be able to mount yocto-cache during builds +installPackages+=(nfs-common) +# libssl-dev provides headers for OpenSSL +installPackages+=(libssl-dev) +# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git +installPackages+=("^libxcb.*") +installPackages+=(libxkbcommon-dev) +installPackages+=(libxkbcommon-x11-dev) +installPackages+=(libx11-xcb-dev) +installPackages+=(libglu1-mesa-dev) +installPackages+=(libxrender-dev) +installPackages+=(libxi-dev) +# Enable linking to system dbus +installPackages+=(libdbus-1-dev) +# Needed libraries for WebEngine +installPackages+=(libudev-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libxss-dev) +installPackages+=(nodejs) +# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev. + +# Common event loop handling +installPackages+=(libglib2.0-dev) +# MySQL support +installPackages+=(libmysqlclient-dev) +# PostgreSQL support +installPackages+=(libpq-dev) +# SQLite support +installPackages+=(libsqlite3-dev) +# ODBC support +installPackages+=(unixodbc-dev) +# Support for FreeType font engine +installPackages+=(libfreetype6-dev) +# Enable the usage of system jpeg libraries +installPackages+=(libjpeg-dev) +# Enable support for printer driver +installPackages+=(libcups2-dev) +# Enable support for printer test +installPackages+=(cups-pdf) +# Install libraries needed for QtMultimedia to be able to support all plugins +installPackages+=(libasound2-dev) +installPackages+=(libgstreamer1.0-dev) +installPackages+=(libgstreamer-plugins-base1.0-dev) +installPackages+=(libgstreamer-plugins-good1.0-dev) +installPackages+=(libgstreamer-plugins-bad1.0-dev) +# Support for cross-building to x86 (needed by WebEngine boot2qt builds) +installPackages+=(g++-multilib) +# python3 development package +installPackages+=(python3-dev) +installPackages+=(python3-pip) +installPackages+=(virtualenv) +installPackages+=(python3-wheel) +# python2 development package +installPackages+=(python-dev) +# Automates interactive applications (Needed by RTA to automate configure testing) +installPackages+=(expect) +installPackages+=(mesa-common-dev) +installPackages+=(libgl1-mesa-glx) +installPackages+=(libgl1-mesa-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(curl) +installPackages+=(libicu-dev) +installPackages+=(zlib1g-dev) +installPackages+=(zlib1g) +installPackages+=(openjdk-8-jdk) +installPackages+=(libgtk-3-dev) +installPackages+=(ninja-build) +installPackages+=(libssl-dev) +installPackages+=(libxcursor-dev) +installPackages+=(libxcomposite-dev) +installPackages+=(libxdamage-dev) +installPackages+=(libxrandr-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libxss-dev) +installPackages+=(libsrtp0-dev) +installPackages+=(libwebp-dev) +installPackages+=(libjsoncpp-dev) +installPackages+=(libopus-dev) +installPackages+=(libminizip-dev) +installPackages+=(libavutil-dev) +installPackages+=(libavformat-dev) +installPackages+=(libavcodec-dev) +installPackages+=(libevent-dev) +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperf) +installPackages+=(libasound2-dev) +installPackages+=(libpulse-dev) +installPackages+=(libxtst-dev) +installPackages+=(libnspr4-dev) +installPackages+=(libnss3-dev) +installPackages+=(libnss3) +installPackages+=(libopenal-dev) +installPackages+=(libbluetooth-dev) +#VirtualBox for RTA +installPackages+=(virtualbox) +installPackages+=(dkms) +# Needed for qtspeech +installPackages+=(libspeechd-dev) +#Pypdf for PDF reading in RTA tests +installPackages+=(python-pypdf2) +# Needed for b2qt +installPackages+=(git-lfs) +installPackages+=(chrpath) +installPackages+=(gawk) +installPackages+=(texinfo) +# Needed for Poppler test in QtWebEngine +installPackages+=(libpoppler-cpp-dev) +# Needed for QtCore +installPackages+=(libdouble-conversion-dev) +installPackages+=(libpcre2-dev) +# Needed for qtgampepad +installPackages+=(libsdl2-2.0) +installPackages+=(libsdl2-dev) +# Needed for qtwebkit +installPackages+=(ruby) +installPackages+=(libxslt1-dev) +installPackages+=(libxml2-dev) +installPackages+=(libhyphen-dev) + +echo "Running update for apt" +waitLoop +sudo apt-get update +echo "Installing packages" +waitLoop +sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" + +# Install all needed packages in a special wheel cache directory +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" + +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" + +OpenSSLVersion="$(openssl version |cut -b 9-14)" +echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt + diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh new file mode 100755 index 00000000..f38c9bab --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-notifications.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-notifications.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..89806892 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-disable-ntp.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh new file mode 100755 index 00000000..7f5140fd --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +# Install Git Large File Storage + +set -ex + +curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add - +sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main' +sudo apt update +sudo apt install git-lfs diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh new file mode 100755 index 00000000..09477763 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-apport.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove-apport.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-apport.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh new file mode 100755 index 00000000..55c6ce79 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove-update_notifier.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh new file mode 100755 index 00000000..15142600 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/linux/gcc.sh +source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" + +InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0 diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang-v100-dyn.sh new file mode 100755 index 00000000..dcd5b2d8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang-v100-dyn.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh new file mode 100755 index 00000000..0d18dbcf --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-libclang.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh new file mode 100755 index 00000000..b371d947 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..7c58c478 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh new file mode 100755 index 00000000..d8df4375 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-fbx.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000..74dd1579 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh new file mode 100755 index 00000000..0527fe85 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-android_linux.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 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 + +# shellcheck source=../common/linux/android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh new file mode 100755 index 00000000..db8a3ff5 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/cmake_linux.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh new file mode 100755 index 00000000..81ea3b17 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/50-openssl_for_android_linux.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 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 + +# shellcheck source=../common/linux/openssl_for_android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh new file mode 100755 index 00000000..82c2c659 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/docker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh new file mode 100755 index 00000000..fcc7d31c --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/91-squish-coco.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +# shellcheck source=../common/linux/squish-coco.sh +source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh new file mode 100644 index 00000000..c8f3ac03 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/ubuntu-version.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install_icu.sh new file mode 100755 index 00000000..8c4980ee --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install_icu.sh @@ -0,0 +1,79 @@ +#!/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$ +## +############################################################################# + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +# This script will install ICU + +icuVersion="60.2" +icuLocationLib="/opt/icu/lib64" +icuLocationInclude="/opt/icu/include" +sha1="2b972d8897783c08dfe1e52af49216ed92656736" +baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu18.04-x64_60_2.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu18.04-x64_60_2.7z" + +sha1Dev="416c89d3ded143ea1d4fcc688dce02b01aaa9ee2" +develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu18.04-x64-devel_60_2.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu18.04-x64-devel_60_2.7z" + +echo "Installing custom ICU $icuVersion $sha1 packages on CentOS to $icuLocationLib" + +targetFile=$(mktemp) +sudo mkdir -p "$icuLocationLib" +sudo mkdir -p "$icuLocationInclude" +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" +sudo 7z x -y -o$icuLocationLib "$targetFile" +sudo rm "$targetFile" + +echo "Installing custom ICU devel packages on CentOS" + +tempDir=$(mktemp -d) + +targetFile=$(mktemp) +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" +7z x -y -o"$tempDir" "$targetFile" + +sudo cp -a "$tempDir"/lib/* "$icuLocationLib" +sudo cp -a "$tempDir"/* /opt/icu/ + +sudo rm "$targetFile" +sudo rm -fr "$tempDir" + +sudo /sbin/ldconfig + +echo "ICU = $icuVersion" >> ~/versions.txt -- cgit v1.2.3 From ad62610ca065a2e37fc2033179ebfc07bc00cfee Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 10 Feb 2021 11:29:57 +0100 Subject: init-repository: Allow 'tqtc-' prefix for qt5 repository Change-Id: Ic4b14e4e6efd43e54a241000e090981ce8b6c651 Reviewed-by: Paul Wicking Reviewed-by: Edward Welbourne (cherry picked from commit 6f7f1cd5508e03be6ee570b4b0d873475d7801dd) Reviewed-by: Qt Cherry-pick Bot --- init-repository | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/init-repository b/init-repository index 63005fd2..ba84cb7a 100755 --- a/init-repository +++ b/init-repository @@ -645,12 +645,13 @@ sub run chomp(my $url = `git config remote.origin.url`); die("Have no origin remote.\n") if (!$url); $url =~ s,\.git$,,; - $url =~ s/qt5$//; + $url =~ s/((?:tqtc-)?qt5)$//; + my $qtrepo = $1 or 'qt5'; $self->{'base-url'} = $url; - $self->git_clone_all_submodules('qt5', $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); + $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); - $self->git_add_remotes('qt5'); + $self->git_add_remotes($qtrepo); $self->git_install_hooks; -- cgit v1.2.3 From 963e5ddd4374ea9ae4de5b585d6ad5ad6d65344f Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 17 Feb 2021 13:02:13 +0200 Subject: Add Insignificant flag for qtbase Android target with Ubuntu 18.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Can't start emulator with Ubuntu 18.04 Task-number: QTBUG-91180 Change-Id: I33bbbe47d3f0861778b295ccf797b5a99a99c58a Reviewed-by: Alexey Edelev Reviewed-by: Tony Sarajärvi (cherry picked from commit 36f1125927d37e77ccd8e82cd949dbd8e08c0988) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qtbase.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 68f47d9c..8b3df2cd 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -22,7 +22,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'Ubuntu-18.04-host' - Features: ['Packaging', 'Sccache', 'AndroidTestRun'] + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'InsignificantTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] -- cgit v1.2.3 From 041fc90b466539db4725e6826a9311a5fb9f197d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Feb 2021 16:08:23 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Ie1c878fc5e89409c64195d87c07a1a872eaf85c7 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 8228a999..e13cdaef 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 8228a999c79c244eb361bd1259bede49f394b853 +Subproject commit e13cdaef7ab8a0c82b3de645acc80d2c532adf28 diff --git a/qtbase b/qtbase index 1803f904..ef973d27 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1803f904bd4e48f9ca1430bb62cc430141380df1 +Subproject commit ef973d277b869275fa07543d7e0701668d43a0f5 diff --git a/qtdeclarative b/qtdeclarative index eac905ab..891c6229 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit eac905abced62d918fbfcd7b932b3ae415dcf8a5 +Subproject commit 891c622926f6e103bf6e86141c8d7c53a1433236 diff --git a/qtdoc b/qtdoc index 7dd9dfe2..807ade4e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7dd9dfe267c37cf926130d60636264a3524fd996 +Subproject commit 807ade4e7f863f50c1dee00c2ac1ba37928053ae diff --git a/qtqa b/qtqa index f15a9b56..818d853a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f15a9b561ab532e08132ba0da947d7aa07752be9 +Subproject commit 818d853ac35acffc7d9cd7efc4591fe4bcf851cc diff --git a/qtquick3d b/qtquick3d index acc9559a..065bd066 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit acc9559aea2df5467f1b6a5153974205f7e4523f +Subproject commit 065bd0668fae58f728f283f463b90e4d82775865 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9aa0c164..a426a482 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9aa0c1648f9d9052260ce821d4c447136dd8c28c +Subproject commit a426a48201b8debbd3fc035c79a85e9a1b3d082a diff --git a/qtquicktimeline b/qtquicktimeline index 9756b4b0..52849577 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9756b4b099c5c43f17ed8e2ad5552cac3b5bbb88 +Subproject commit 528495772548403670eaf2387cdfb758f2c28a49 diff --git a/qtshadertools b/qtshadertools index 9991cc85..8060bc52 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 9991cc85ee0a92a04e1885fa7d87665dce11e8f0 +Subproject commit 8060bc525d7bde4e3309023e3ea9e0a6abe21d3e diff --git a/qtsvg b/qtsvg index 3b703b58..1cc8cbb7 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 3b703b5813d4130bcc07a1f713ddb2b0001e7e94 +Subproject commit 1cc8cbb76770d067e5c513ac4ae4f36e10fa25eb diff --git a/qttools b/qttools index b370d5d8..d2b42e5c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b370d5d8541ed6d8a3281c8e8656f08ac8a1d830 +Subproject commit d2b42e5c2f6cada16ec8b40fa1847447da0b09e8 diff --git a/qttranslations b/qttranslations index f5a02f23..9fb415ab 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f5a02f238c301654f7cffe9d9911ca1f9dc57e29 +Subproject commit 9fb415ab9c2b7e56b8a3189d826fda264b6edbef diff --git a/qtwayland b/qtwayland index 68c69886..cd7d9a7a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 68c69886c2421b35c8e518ea8871451ee41685a2 +Subproject commit cd7d9a7a90c71c980c3e97e31d592c8da8a8d29a -- cgit v1.2.3 From 7f2beb5fe64dc13229aff34702cd1431f573be4a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Feb 2021 23:01:52 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I41ac92f8bb6e7d11a8497bd7f50b883ba9f1c5c1 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index e13cdaef..da5c4bb0 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit e13cdaef7ab8a0c82b3de645acc80d2c532adf28 +Subproject commit da5c4bb0e1137aaf02fff2261932bc9f8f704470 diff --git a/qtbase b/qtbase index ef973d27..b6778832 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ef973d277b869275fa07543d7e0701668d43a0f5 +Subproject commit b6778832636fc8f6911eb30bc9767ea6caaf6642 diff --git a/qtdeclarative b/qtdeclarative index 891c6229..c86455bb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 891c622926f6e103bf6e86141c8d7c53a1433236 +Subproject commit c86455bb70a3d10a1477782b29fd54894392e172 diff --git a/qtdoc b/qtdoc index 807ade4e..d1389fea 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 807ade4e7f863f50c1dee00c2ac1ba37928053ae +Subproject commit d1389fea18eab27577168a6eaf50699b8b5919eb diff --git a/qtqa b/qtqa index 818d853a..baeb9178 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 818d853ac35acffc7d9cd7efc4591fe4bcf851cc +Subproject commit baeb9178137e86aa6462d44bc025f114a4ec5f19 diff --git a/qtquick3d b/qtquick3d index 065bd066..613be7e6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 065bd0668fae58f728f283f463b90e4d82775865 +Subproject commit 613be7e6ba96aa9d9ca68cbd7d2d8fcaff4e37a2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a426a482..b6cbdd97 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a426a48201b8debbd3fc035c79a85e9a1b3d082a +Subproject commit b6cbdd97a8f8a9989178ab584a3b8006feba9c76 diff --git a/qtquicktimeline b/qtquicktimeline index 52849577..51286c1e 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 528495772548403670eaf2387cdfb758f2c28a49 +Subproject commit 51286c1ece7bc040f51aef5e7bc503b97c28ed6b diff --git a/qtshadertools b/qtshadertools index 8060bc52..c16f3ae9 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 8060bc525d7bde4e3309023e3ea9e0a6abe21d3e +Subproject commit c16f3ae9ea357e5437e81b4dab133ea9807b4458 diff --git a/qtsvg b/qtsvg index 1cc8cbb7..d3241a76 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1cc8cbb76770d067e5c513ac4ae4f36e10fa25eb +Subproject commit d3241a766351885b448b6a709a552f67f61863db diff --git a/qttools b/qttools index d2b42e5c..7cbafff6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d2b42e5c2f6cada16ec8b40fa1847447da0b09e8 +Subproject commit 7cbafff65f674a4b881eb0158e4f2c292d7c37b3 diff --git a/qttranslations b/qttranslations index 9fb415ab..65dd8468 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 9fb415ab9c2b7e56b8a3189d826fda264b6edbef +Subproject commit 65dd846878df31a62018fbd565caff9b2afd72e0 diff --git a/qtwayland b/qtwayland index cd7d9a7a..505a6666 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit cd7d9a7a90c71c980c3e97e31d592c8da8a8d29a +Subproject commit 505a66663e2c122f862a7b3485d3f4daa4bfb621 -- cgit v1.2.3 From 7d8b27fb63db4c443d8a31c78691b9a1ad71caf2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 19 Feb 2021 05:14:09 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I80b214d463b8c37a7daf0f5723b9f5b16292664b Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index da5c4bb0..439bc92b 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit da5c4bb0e1137aaf02fff2261932bc9f8f704470 +Subproject commit 439bc92bf0192adc93cff22076ba933e8d3627bb diff --git a/qtbase b/qtbase index b6778832..bbb2fe3c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b6778832636fc8f6911eb30bc9767ea6caaf6642 +Subproject commit bbb2fe3c2805cb8a6a17e095e3f287c505110222 diff --git a/qtdeclarative b/qtdeclarative index c86455bb..006f2453 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c86455bb70a3d10a1477782b29fd54894392e172 +Subproject commit 006f245384bed529036f3abd875de6ac159752dc diff --git a/qtdoc b/qtdoc index d1389fea..44ecdc2f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d1389fea18eab27577168a6eaf50699b8b5919eb +Subproject commit 44ecdc2fc6b03d3267fd1ddeafd33fc93540cf40 diff --git a/qtquick3d b/qtquick3d index 613be7e6..cce4adae 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 613be7e6ba96aa9d9ca68cbd7d2d8fcaff4e37a2 +Subproject commit cce4adae17455a8c0728a326793afe041274baef diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b6cbdd97..9d46f548 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b6cbdd97a8f8a9989178ab584a3b8006feba9c76 +Subproject commit 9d46f548f995cc28b45bed754fae67026ffddf55 diff --git a/qtquicktimeline b/qtquicktimeline index 51286c1e..82c667c0 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 51286c1ece7bc040f51aef5e7bc503b97c28ed6b +Subproject commit 82c667c070cf3fd4b9aabaa5297869f7fd8315c7 diff --git a/qtshadertools b/qtshadertools index c16f3ae9..de7d62df 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit c16f3ae9ea357e5437e81b4dab133ea9807b4458 +Subproject commit de7d62df487cc2ba2061b2a118a17f5509474405 diff --git a/qtsvg b/qtsvg index d3241a76..f5639949 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d3241a766351885b448b6a709a552f67f61863db +Subproject commit f5639949e29c018b2de48f4ec0c1b63e2a7bb441 diff --git a/qttools b/qttools index 7cbafff6..1a5fa085 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7cbafff65f674a4b881eb0158e4f2c292d7c37b3 +Subproject commit 1a5fa0852d8f2692c28a0a714b1fdd42327fcce7 diff --git a/qttranslations b/qttranslations index 65dd8468..936bc6e0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 65dd846878df31a62018fbd565caff9b2afd72e0 +Subproject commit 936bc6e086a9fd3405fd0d1e86d09559222794b8 diff --git a/qtwayland b/qtwayland index 505a6666..25841477 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 505a66663e2c122f862a7b3485d3f4daa4bfb621 +Subproject commit 258414771387818220f3f1f0be036ea6be54ebb2 -- cgit v1.2.3 From b3182a84b5e75b94d1c69aa551ca2fd5def5fb2c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 22 Jan 2021 09:31:12 +0200 Subject: Update platform configs for qdb Use cmake platforms to build qdb. Change-Id: I9d7e452bf70699799527ea38c97ec64a8fa0fc10 Reviewed-by: Toni Saario (cherry picked from commit 7b3e2f369d9ba2ee5e636e1ec9b7a3890363e187) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qdb.yaml | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index a1cb71fd..c3233842 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -1,28 +1,3 @@ Version: 2 -Module only: True -Configurations: - - - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'MSVC2015' - Target arch: 'x86' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -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-52' - Compiler: 'MSVC2015' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -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%' - - - Template: 'qtci-linux-CentOS-8.3-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - - - Template: 'qtci-macos-10.14-x86_64' - Compiler: 'Clang' - Features: ['Packaging'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu' - - - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' - Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] +Include: [cmake_platforms.yaml] +Configurations: [] -- cgit v1.2.3 From a415711500dfaa682c1f7cc1bd96f8f47ed73721 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 2 Feb 2021 15:42:11 +0200 Subject: Add platform configs for qtdeviceutilities Change-Id: Ica3aa46e3302dc9b46c64bbef222e3e958f56a35 Reviewed-by: Toni Saario (cherry picked from commit cd888a07fe0a483b3f5d4f4453a0ab23fc12f8a7) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qtdeviceutilities.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 coin/platform_configs/qtdeviceutilities.yaml diff --git a/coin/platform_configs/qtdeviceutilities.yaml b/coin/platform_configs/qtdeviceutilities.yaml new file mode 100644 index 00000000..c3233842 --- /dev/null +++ b/coin/platform_configs/qtdeviceutilities.yaml @@ -0,0 +1,3 @@ +Version: 2 +Include: [cmake_platforms.yaml] +Configurations: [] -- cgit v1.2.3 From 394b2cb94efe3c51d1cde855efbc5dd48ef94dbf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 22 Feb 2021 10:05:05 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: If0f285a85a742f884e671c62a76a0c2133647040 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt5compat b/qt5compat index 439bc92b..5b42aeb3 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 439bc92bf0192adc93cff22076ba933e8d3627bb +Subproject commit 5b42aeb30a2acdede35fa7e7c021d1572fe2b735 diff --git a/qtdeclarative b/qtdeclarative index 006f2453..974fc46c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 006f245384bed529036f3abd875de6ac159752dc +Subproject commit 974fc46c3d69c270c0260c877aa4e9a0979edec1 diff --git a/qtdoc b/qtdoc index 44ecdc2f..a3d3cbb4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 44ecdc2fc6b03d3267fd1ddeafd33fc93540cf40 +Subproject commit a3d3cbb4c8b13308d45e6aa934da401f4606e3ad diff --git a/qtqa b/qtqa index baeb9178..ca6292fa 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit baeb9178137e86aa6462d44bc025f114a4ec5f19 +Subproject commit ca6292fac8c0ca7be27589638b2a1c68761cf9f7 diff --git a/qtquick3d b/qtquick3d index cce4adae..4032b4c6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit cce4adae17455a8c0728a326793afe041274baef +Subproject commit 4032b4c6baa401cdcd6a6862e65c8ef638265e97 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9d46f548..76b94c38 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9d46f548f995cc28b45bed754fae67026ffddf55 +Subproject commit 76b94c387083528be6f6025170860ed31a111855 diff --git a/qtquicktimeline b/qtquicktimeline index 82c667c0..33077715 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 82c667c070cf3fd4b9aabaa5297869f7fd8315c7 +Subproject commit 33077715dd32044cebae207e1e6b23306af047da diff --git a/qttools b/qttools index 1a5fa085..901bccaf 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1a5fa0852d8f2692c28a0a714b1fdd42327fcce7 +Subproject commit 901bccafa41a54675c406fd0aaa671705a4d618d diff --git a/qttranslations b/qttranslations index 936bc6e0..65c25cd4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 936bc6e086a9fd3405fd0d1e86d09559222794b8 +Subproject commit 65c25cd4e2bf03e3abfda787a96e918be9d0081f diff --git a/qtwayland b/qtwayland index 25841477..a1330e8d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 258414771387818220f3f1f0be036ea6be54ebb2 +Subproject commit a1330e8d0265d8ee339e5437ffe34a400d08a2d4 -- cgit v1.2.3 From 88c07c72e24b50cd5ddc774f48134d85de256f96 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 18 Feb 2021 13:02:35 +0200 Subject: New images with accessibility for squish for macOS 10.15 and 11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3559 Change-Id: I9a9d4c4f01f883c83adbd097d8045012e198c4fe Reviewed-by: Johanna Äijälä Reviewed-by: Tony Sarajärvi (cherry picked from commit c8a55fece54870c8c6ad9571f2d29402d56c556e) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/macos-developer-build-tests.yaml | 4 ++-- coin/platform_configs/macos.yaml | 8 ++++---- coin/pre-provisioning/qtci-macos-10.15-x86_64/README | 7 +++++++ coin/pre-provisioning/qtci-macos-11.0-x86_64/README | 8 ++++++++ 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 coin/pre-provisioning/qtci-macos-10.15-x86_64/README create mode 100644 coin/pre-provisioning/qtci-macos-11.0-x86_64/README diff --git a/coin/platform_configs/macos-developer-build-tests.yaml b/coin/platform_configs/macos-developer-build-tests.yaml index 458462d5..207f7ec7 100644 --- a/coin/platform_configs/macos-developer-build-tests.yaml +++ b/coin/platform_configs/macos-developer-build-tests.yaml @@ -8,13 +8,13 @@ Configurations: Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Id: 'macos-10.15-x86_64-developer-build-tests' - Template: 'qtci-macos-10.15-x86_64-100' + Template: 'qtci-macos-10.15-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Id: 'macos-11-x86_64-developer-build-tests' - Template: 'qtci-macos-11.0-x86_64-100' + Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index fcbd14bf..bc76aff8 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -3,7 +3,7 @@ Configurations: # Build with latest Xcode - Id: 'macos-latest-xcode-x86_64-packaging-build' - Template: 'qtci-macos-11.0-x86_64-100' + Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' Features: ['Packaging', 'Sccache', 'DoNotRunTests'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..' @@ -21,13 +21,13 @@ Configurations: Platform dependency: 'macos-latest-xcode-x86_64-packaging-build' - Id: 'macos-10.15-x86_64-tests' - Template: 'qtci-macos-10.15-x86_64-100' + Template: 'qtci-macos-10.15-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'macos-latest-xcode-x86_64-packaging-build' - Id: 'macos-11-x86_64-tests' - Template: 'qtci-macos-11.0-x86_64-100' + Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'macos-latest-xcode-x86_64-packaging-build' @@ -36,7 +36,7 @@ Configurations: # See macos-developer-build-tests.yaml for the tests - Id: 'macos-latest-xcode-x86_64-developer-build' - Template: 'qtci-macos-11.0-x86_64-100' + Template: 'qtci-macos-11.0-x86_64-102' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests'] Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' diff --git a/coin/pre-provisioning/qtci-macos-10.15-x86_64/README b/coin/pre-provisioning/qtci-macos-10.15-x86_64/README new file mode 100644 index 00000000..82525162 --- /dev/null +++ b/coin/pre-provisioning/qtci-macos-10.15-x86_64/README @@ -0,0 +1,7 @@ +Add accessibility settings: +/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF" +insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","com.froglogic.squish.ide.product",0,1,1,"UNSEEN",0,1612871478) + +insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","/Users/qt/bootstrap-agent",1,1,1,"UNSEEN",0,1612871478); +EOF + diff --git a/coin/pre-provisioning/qtci-macos-11.0-x86_64/README b/coin/pre-provisioning/qtci-macos-11.0-x86_64/README new file mode 100644 index 00000000..6713914d --- /dev/null +++ b/coin/pre-provisioning/qtci-macos-11.0-x86_64/README @@ -0,0 +1,8 @@ +Add accessibility settings: +/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF"{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }} +('kTCCServiceAccessibility','com.froglogic.squish.ide.product',0,2,4,1,0,0,1612867994); + +{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }} +('kTCCServiceAccessibility','/Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/jre/bin/java',1,2,4,1,0,0,1612867994); + +EOF -- cgit v1.2.3 From 5670dccefd505a0df265be3499e3b536ad30d88a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 22 Feb 2021 08:25:35 +0200 Subject: Make QEMU builds significant All tests pass, remove InsignificantTests from QEMU builds. Task-number: QTBUG-86238 Change-Id: Ia3d2b9ef3ce06cbdf67c99bcbe64f36f7bbdb1ec Reviewed-by: Heikki Halmet (cherry picked from commit b6c8b8f47018708bfc0e364622c0d8146a96e062) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_qemu.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index d80bf12e..59d86700 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -6,7 +6,7 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests'] + Features: ['Sccache'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}', @@ -22,7 +22,7 @@ Configurations: Target arch: 'arm64' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests'] + Features: ['Sccache'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', @@ -38,7 +38,7 @@ Configurations: Target arch: 'mips64' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'InsignificantTests', 'DisableTests'] + Features: ['Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}', -- cgit v1.2.3 From dc079f99ffd34c9d8ec12d9fccab6c3f2ec81d22 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 22 Feb 2021 19:40:00 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I81fd035c10796be173b9ec10ad82aedeca50eac9 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 5b42aeb3..ef2afa80 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 5b42aeb30a2acdede35fa7e7c021d1572fe2b735 +Subproject commit ef2afa80c062c55d7fa31ebd78d8a16c076fa905 diff --git a/qtbase b/qtbase index bbb2fe3c..64c47d7f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bbb2fe3c2805cb8a6a17e095e3f287c505110222 +Subproject commit 64c47d7f61ff51762709d45e8e69fa90926dc6a3 diff --git a/qtdeclarative b/qtdeclarative index 974fc46c..91119179 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 974fc46c3d69c270c0260c877aa4e9a0979edec1 +Subproject commit 911191793f10b6c160b282b98e7cf585103ca47c diff --git a/qtdoc b/qtdoc index a3d3cbb4..53aced78 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a3d3cbb4c8b13308d45e6aa934da401f4606e3ad +Subproject commit 53aced7852667ccc03ad80c1965aa857fc409b11 diff --git a/qtqa b/qtqa index ca6292fa..9e0f5552 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit ca6292fac8c0ca7be27589638b2a1c68761cf9f7 +Subproject commit 9e0f55524cdfacfa1cec55cbe41958ba3dba0a20 diff --git a/qtquick3d b/qtquick3d index 4032b4c6..d1c53ed4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4032b4c6baa401cdcd6a6862e65c8ef638265e97 +Subproject commit d1c53ed4455c55403960270746160a735578855e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 76b94c38..383d0bf1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 76b94c387083528be6f6025170860ed31a111855 +Subproject commit 383d0bf17e3e7b65b5e06be16e1c49228bd25589 diff --git a/qtquicktimeline b/qtquicktimeline index 33077715..18e0ed87 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 33077715dd32044cebae207e1e6b23306af047da +Subproject commit 18e0ed8743b77cfbcfa1d4697285729b60196b94 diff --git a/qtshadertools b/qtshadertools index de7d62df..6780ec67 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit de7d62df487cc2ba2061b2a118a17f5509474405 +Subproject commit 6780ec6759fb1478c72c297879426bbd5ccea01e diff --git a/qtsvg b/qtsvg index f5639949..460d2f2d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f5639949e29c018b2de48f4ec0c1b63e2a7bb441 +Subproject commit 460d2f2d287688f23da0ebc4ddec79e3f9e0c26d diff --git a/qttools b/qttools index 901bccaf..28ad3645 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 901bccafa41a54675c406fd0aaa671705a4d618d +Subproject commit 28ad364533cb8de3b509a619c3276225ecffbc3c diff --git a/qttranslations b/qttranslations index 65c25cd4..9eb0e57a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 65c25cd4e2bf03e3abfda787a96e918be9d0081f +Subproject commit 9eb0e57a996ae89156ba585f54dd533f1c626f34 diff --git a/qtwayland b/qtwayland index a1330e8d..251f71e6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a1330e8d0265d8ee339e5437ffe34a400d08a2d4 +Subproject commit 251f71e66875dd7108d99b0a9bc0f9bf07ff15b1 -- cgit v1.2.3 From 90c9e45764ba7b59394333e4ee47cd7a1c0d32ba Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Feb 2021 02:47:11 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I49f4a646332f3d97556d73e2fdf4caa658343d3c Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index ef2afa80..566f80be 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit ef2afa80c062c55d7fa31ebd78d8a16c076fa905 +Subproject commit 566f80bee1dbe2d1d9a2e7e2c2a32b388691c888 diff --git a/qtbase b/qtbase index 64c47d7f..31849db9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 64c47d7f61ff51762709d45e8e69fa90926dc6a3 +Subproject commit 31849db9c678597ce1f7b86fa6b0d34541aa69fd diff --git a/qtdeclarative b/qtdeclarative index 91119179..806b3924 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 911191793f10b6c160b282b98e7cf585103ca47c +Subproject commit 806b39241ef114478fc4b37639418748fd15b171 diff --git a/qtdoc b/qtdoc index 53aced78..327eaa5e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 53aced7852667ccc03ad80c1965aa857fc409b11 +Subproject commit 327eaa5e25d19d788983fa1333c04202b8c81ccf diff --git a/qtqa b/qtqa index 9e0f5552..cf933361 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 9e0f55524cdfacfa1cec55cbe41958ba3dba0a20 +Subproject commit cf9333611e485eba5b739e9186dc418618ecf45f diff --git a/qtquick3d b/qtquick3d index d1c53ed4..c0d1248a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit d1c53ed4455c55403960270746160a735578855e +Subproject commit c0d1248a6ba19cd7991c65e401fdfe3f652081fa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 383d0bf1..545de29a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 383d0bf17e3e7b65b5e06be16e1c49228bd25589 +Subproject commit 545de29a8855fee1608a0cc3e420dedbfdfcc4bb diff --git a/qtquicktimeline b/qtquicktimeline index 18e0ed87..9c7deb2d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 18e0ed8743b77cfbcfa1d4697285729b60196b94 +Subproject commit 9c7deb2df404eca51daebd2b2ebb582f445532d0 diff --git a/qtshadertools b/qtshadertools index 6780ec67..3dafcd2d 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 6780ec6759fb1478c72c297879426bbd5ccea01e +Subproject commit 3dafcd2d14e1147c96eb1ec6f36fc95713a6aa9d diff --git a/qtsvg b/qtsvg index 460d2f2d..66b85f90 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 460d2f2d287688f23da0ebc4ddec79e3f9e0c26d +Subproject commit 66b85f90f47eae32c813ab38ac9e20efdcdf55a6 diff --git a/qttools b/qttools index 28ad3645..909bc7bd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 28ad364533cb8de3b509a619c3276225ecffbc3c +Subproject commit 909bc7bd0933241d629efe2730c7b9262c15bda0 diff --git a/qttranslations b/qttranslations index 9eb0e57a..7608b1c4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 9eb0e57a996ae89156ba585f54dd533f1c626f34 +Subproject commit 7608b1c44bace97f701e48e2f1c995cf91139b7a diff --git a/qtwayland b/qtwayland index 251f71e6..22c0d479 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 251f71e66875dd7108d99b0a9bc0f9bf07ff15b1 +Subproject commit 22c0d47905aa1fd8e9204bbafce2a1f10c9a9716 -- cgit v1.2.3 From b30917ecd21dcec2b850641a9c36a762908937e7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Feb 2021 06:52:19 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Id986efbefb9a701c2737d1abce48ebf639043d30 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 566f80be..1bfa61a6 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 566f80bee1dbe2d1d9a2e7e2c2a32b388691c888 +Subproject commit 1bfa61a68c7a93a23cd3ec5d2511db7b62a9ba24 diff --git a/qtbase b/qtbase index 31849db9..b06c3a0a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 31849db9c678597ce1f7b86fa6b0d34541aa69fd +Subproject commit b06c3a0af83a4369257e498b75c183365ec44b5d diff --git a/qtdeclarative b/qtdeclarative index 806b3924..d906e9fd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 806b39241ef114478fc4b37639418748fd15b171 +Subproject commit d906e9fdd7c6bcaabbbb62c44c09bf8199ee10d4 diff --git a/qtdoc b/qtdoc index 327eaa5e..ad30c989 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 327eaa5e25d19d788983fa1333c04202b8c81ccf +Subproject commit ad30c989c6ca8761f18f2d1bd050d7a77f08b26f diff --git a/qtqa b/qtqa index cf933361..87c31c36 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cf9333611e485eba5b739e9186dc418618ecf45f +Subproject commit 87c31c368e188bff2af9aa23c9f96b43c25df238 diff --git a/qtquick3d b/qtquick3d index c0d1248a..3df71294 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c0d1248a6ba19cd7991c65e401fdfe3f652081fa +Subproject commit 3df71294a20b5a7509b65b54e2ef95a5327f5c86 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 545de29a..3e4f2427 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 545de29a8855fee1608a0cc3e420dedbfdfcc4bb +Subproject commit 3e4f24270cc63c2c294784bca1d1ed511758bd42 diff --git a/qtquicktimeline b/qtquicktimeline index 9c7deb2d..486d4bfe 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9c7deb2df404eca51daebd2b2ebb582f445532d0 +Subproject commit 486d4bfee4a3ea9e2f2577bb1d4093107570f9b7 diff --git a/qtshadertools b/qtshadertools index 3dafcd2d..50257b0b 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 3dafcd2d14e1147c96eb1ec6f36fc95713a6aa9d +Subproject commit 50257b0b9fd5eb070d1ec82d0eff96fd196d8a6c diff --git a/qtsvg b/qtsvg index 66b85f90..b990a209 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 66b85f90f47eae32c813ab38ac9e20efdcdf55a6 +Subproject commit b990a209d302f241ac974745785ab48e3b15063c diff --git a/qttools b/qttools index 909bc7bd..659af42e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 909bc7bd0933241d629efe2730c7b9262c15bda0 +Subproject commit 659af42ebbcbbab51ab538848268511dab2a2141 diff --git a/qttranslations b/qttranslations index 7608b1c4..a3af3b06 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 7608b1c44bace97f701e48e2f1c995cf91139b7a +Subproject commit a3af3b0625fd3ccabf1f789e2148daf23771ff89 diff --git a/qtwayland b/qtwayland index 22c0d479..ad92fcc8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 22c0d47905aa1fd8e9204bbafce2a1f10c9a9716 +Subproject commit ad92fcc8ba406866910e72805121d3e94dd5975b -- cgit v1.2.3 From bf77b43a6f474e7236aa1bea0302100775014e98 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Feb 2021 16:36:41 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I60b1a1588833e98a13c3eb57bc65964dd8b5a513 Reviewed-by: Qt Submodule Update Bot --- qtquick3d | 2 +- qtwayland | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtquick3d b/qtquick3d index 3df71294..5b299e90 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 3df71294a20b5a7509b65b54e2ef95a5327f5c86 +Subproject commit 5b299e902a7d157cb26f5e5d347385a468661422 diff --git a/qtwayland b/qtwayland index ad92fcc8..286dcc5b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ad92fcc8ba406866910e72805121d3e94dd5975b +Subproject commit 286dcc5b2452a4b6cf84f78ca0142984902c3f24 -- cgit v1.2.3 From 0c3bc777addda779412479c260d8682f6e3d630a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Feb 2021 22:40:07 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I3b7d6c8c5dc138d9afe2cc9260100b21b27d8ec3 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index 1bfa61a6..5786e20b 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 1bfa61a68c7a93a23cd3ec5d2511db7b62a9ba24 +Subproject commit 5786e20b517be5055a0c8b03b4a4b1785315a5a0 diff --git a/qtbase b/qtbase index b06c3a0a..a363e1e8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b06c3a0af83a4369257e498b75c183365ec44b5d +Subproject commit a363e1e8ea416f72380668f483661cef0b526448 diff --git a/qtdeclarative b/qtdeclarative index d906e9fd..c6e17b85 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d906e9fdd7c6bcaabbbb62c44c09bf8199ee10d4 +Subproject commit c6e17b85fc7ea6273376f94f24a357c0565beb2a diff --git a/qtdoc b/qtdoc index ad30c989..918e8b9a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ad30c989c6ca8761f18f2d1bd050d7a77f08b26f +Subproject commit 918e8b9a38ebbba002a77674872b846e15cbb3fd diff --git a/qtquick3d b/qtquick3d index 5b299e90..53d78de4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 5b299e902a7d157cb26f5e5d347385a468661422 +Subproject commit 53d78de4f0d3d1267d12a252f89bbebe943111f1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 3e4f2427..1dd6c0cb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 3e4f24270cc63c2c294784bca1d1ed511758bd42 +Subproject commit 1dd6c0cbf21d48869aa62cddccd8cf73f9dc0e3f diff --git a/qtquicktimeline b/qtquicktimeline index 486d4bfe..afec627f 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 486d4bfee4a3ea9e2f2577bb1d4093107570f9b7 +Subproject commit afec627f894099d6d36d15799849bac4d488d1df diff --git a/qtshadertools b/qtshadertools index 50257b0b..939aa4dd 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 50257b0b9fd5eb070d1ec82d0eff96fd196d8a6c +Subproject commit 939aa4dde16ca7df88d7176d033bac5160d50312 diff --git a/qtsvg b/qtsvg index b990a209..94ca43dc 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b990a209d302f241ac974745785ab48e3b15063c +Subproject commit 94ca43dc37a3a0dd3ca576b900d301ee6424ecdd diff --git a/qttools b/qttools index 659af42e..13c42734 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 659af42ebbcbbab51ab538848268511dab2a2141 +Subproject commit 13c427345ffbe0330e5db52c7e610469efcaf12a diff --git a/qttranslations b/qttranslations index a3af3b06..cb0853b3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit a3af3b0625fd3ccabf1f789e2148daf23771ff89 +Subproject commit cb0853b304ee7e6e75f0a669e77e7a5b4e1ba7b6 diff --git a/qtwayland b/qtwayland index 286dcc5b..4d390734 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 286dcc5b2452a4b6cf84f78ca0142984902c3f24 +Subproject commit 4d390734cd146113097746048412f25d5a2a2f8b -- cgit v1.2.3 From 025759926d691c6a61bcb93f5002255b87fd9a9c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 24 Feb 2021 02:33:42 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I9ee42d73e1cd7db8f5418110b6386381e72fa5a4 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index 5786e20b..48800486 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 5786e20b517be5055a0c8b03b4a4b1785315a5a0 +Subproject commit 48800486791f780d091906ac7f01abd3a9a9e018 diff --git a/qtbase b/qtbase index a363e1e8..5d323919 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a363e1e8ea416f72380668f483661cef0b526448 +Subproject commit 5d323919e165c8266b46b9dc3bf709c6bdf568c1 diff --git a/qtdeclarative b/qtdeclarative index c6e17b85..0d584729 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c6e17b85fc7ea6273376f94f24a357c0565beb2a +Subproject commit 0d5847292b36896a23e5ccb6fca40e09c3a6d13d diff --git a/qtdoc b/qtdoc index 918e8b9a..9805211c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 918e8b9a38ebbba002a77674872b846e15cbb3fd +Subproject commit 9805211cc5e22709ba885c127f24395141fc6016 diff --git a/qtquick3d b/qtquick3d index 53d78de4..e9d369a6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 53d78de4f0d3d1267d12a252f89bbebe943111f1 +Subproject commit e9d369a6e0d3bb7e8728b25d19ff38a9f38f96f2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1dd6c0cb..9798d2f7 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1dd6c0cbf21d48869aa62cddccd8cf73f9dc0e3f +Subproject commit 9798d2f7e44bac551d8d3ce235916ca82bd8913c diff --git a/qtquicktimeline b/qtquicktimeline index afec627f..fe7ce0e2 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit afec627f894099d6d36d15799849bac4d488d1df +Subproject commit fe7ce0e234ae8f302173d1d10fe1be3982b84327 diff --git a/qtshadertools b/qtshadertools index 939aa4dd..d1f451e7 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 939aa4dde16ca7df88d7176d033bac5160d50312 +Subproject commit d1f451e73ced4a1e6a84572b174d709d7d76b90e diff --git a/qtsvg b/qtsvg index 94ca43dc..7380fa91 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 94ca43dc37a3a0dd3ca576b900d301ee6424ecdd +Subproject commit 7380fa91685edf4feac7bd024786533c1ca46be9 diff --git a/qttools b/qttools index 13c42734..baccc62e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 13c427345ffbe0330e5db52c7e610469efcaf12a +Subproject commit baccc62ed22f4eb0ddc63dd86b7d8f28eef45583 diff --git a/qttranslations b/qttranslations index cb0853b3..144f84d3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit cb0853b304ee7e6e75f0a669e77e7a5b4e1ba7b6 +Subproject commit 144f84d3761208a66ae80adca58f2897a25d3d10 diff --git a/qtwayland b/qtwayland index 4d390734..740e5ba7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4d390734cd146113097746048412f25d5a2a2f8b +Subproject commit 740e5ba7e25a5112888af8cc74f075f344a9c42b -- cgit v1.2.3 From 48d184635c1194fc8411d343169bb646d48d4014 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 23 Feb 2021 15:29:34 +0200 Subject: Change configuration arguments for Ubuntu 18.04 to match CentOS target We shouldn't change configuration parameters when whiching to use Ubuntu 18.04 instead of CentOS 8.3 Change-Id: Icfce35acec8baa4488089e555c311a063455c24b Reviewed-by: Qt CI Bot Reviewed-by: Jani Heikkinen (cherry picked from commit 0a6511c1e7f3184b7cbcbffd02bce1c5d28e3fa9) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 120daa4b..fab60021 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -50,7 +50,7 @@ Configurations: Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'DoNotRunTests'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY' Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] - -- cgit v1.2.3 From 790b582893d5cac347e1bd75b84a2029706a9e5d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 25 Feb 2021 13:55:36 +0200 Subject: Provisioning: Remove squish script call under Windows 10 x86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA don't use squish with Windows 10 x86 in Qt6 Change-Id: Ib1c27e53310506f2c91ab8b65404caba8fcfcaf8 Reviewed-by: Johanna Äijälä Reviewed-by: Tony Sarajärvi (cherry picked from commit 26bffd2fabfa4dce65e97d0e24ab6a7a7279a11d) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-windows-10-x86/90-squish.ps1 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 coin/provisioning/qtci-windows-10-x86/90-squish.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 b/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 deleted file mode 100644 index ff758845..00000000 --- a/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\squishInstall.ps1" -- cgit v1.2.3 From fada0bd6de490dc164004e27f4685e9783d2d450 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 25 Feb 2021 15:07:57 +0100 Subject: init-repository: Fix incorrect use of 'or' operator This fixes the warning 'Useless use of a constant ("qt5") in void context at ./init-repository line 649.' Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6 Reviewed-by: Edward Welbourne (cherry picked from commit 8ebf0095c38fa5aee577cbd0fd325346f9712ddb) Reviewed-by: Qt Cherry-pick Bot --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index ba84cb7a..0fbc98b6 100755 --- a/init-repository +++ b/init-repository @@ -646,7 +646,7 @@ sub run die("Have no origin remote.\n") if (!$url); $url =~ s,\.git$,,; $url =~ s/((?:tqtc-)?qt5)$//; - my $qtrepo = $1 or 'qt5'; + my $qtrepo = $1 || 'qt5'; $self->{'base-url'} = $url; $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); -- cgit v1.2.3 From 58a2d3ab27c33685d4921d7e0fc1a9aa711ffb8c Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 25 Feb 2021 10:52:39 +0200 Subject: Fix branch for additional libraries We are in '6.1' so '6.1' needs to be used instead of 'dev' Change-Id: I89db2a5d33658ddb26b51abec41c5e9735850dce Reviewed-by: Akseli Salovaara --- .gitmodules | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index a856e9ba..44523739 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,7 +21,7 @@ recommends = qttools path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtmultimedia"] depends = qtbase @@ -125,14 +125,14 @@ recommends = qtdeclarative qtshadertools qttools path = qt3d url = ../qt3d.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtimageformats"] depends = qtbase recommends = qttools path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtgraphicaleffects"] depends = qtdeclarative @@ -239,21 +239,21 @@ recommends = qtdeclarative qtmultimedia qttools path = qtcharts url = ../qtcharts.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia qttools path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols qttools path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtgamepad"] depends = qtbase @@ -267,7 +267,7 @@ recommends = qttools path = qtscxml url = ../qtscxml.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtspeech"] depends = qtbase @@ -281,7 +281,7 @@ recommends = qttools path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtremoteobjects"] depends = qtbase @@ -302,7 +302,7 @@ recommends = qttools path = qtlottie url = ../qtlottie.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtquicktimeline"] depends = qtbase qtdeclarative @@ -332,17 +332,17 @@ depends = qtbase qttools path = qtcoap url = ../qtcoap.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtmqtt"] depends = qtbase qtdeclarative qttools path = qtmqtt url = ../qtmqtt.git - branch = dev + branch = 6.1 status = additionalLibrary [submodule "qtopcua"] depends = qtbase qtdeclarative qtquickcontrols2 qttools path = qtopcua url = ../qtopcua.git - branch = dev + branch = 6.1 status = additionalLibrary -- cgit v1.2.3 From a62d1f60609d6696a022cac118263758180f3e99 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Mar 2021 09:28:21 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I3c61d3853d29022cc8eddb7d6c59c9b02573c278 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 48800486..7d288b69 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 48800486791f780d091906ac7f01abd3a9a9e018 +Subproject commit 7d288b69f695b4fa99e207393a30f31239f16e17 diff --git a/qtbase b/qtbase index 5d323919..cfe5b1b8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5d323919e165c8266b46b9dc3bf709c6bdf568c1 +Subproject commit cfe5b1b8dd04b98a229b53bb1474cae2b5731395 diff --git a/qtdeclarative b/qtdeclarative index 0d584729..7a089f77 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0d5847292b36896a23e5ccb6fca40e09c3a6d13d +Subproject commit 7a089f779c756800a24e04f1b748173709ac7826 diff --git a/qtdoc b/qtdoc index 9805211c..a0f6a9b9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9805211cc5e22709ba885c127f24395141fc6016 +Subproject commit a0f6a9b9fb6823faf2195072b978aa67a08b5f2a diff --git a/qtqa b/qtqa index 87c31c36..c435a78d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 87c31c368e188bff2af9aa23c9f96b43c25df238 +Subproject commit c435a78d312350451dda705d458daa7cdb1f7d77 diff --git a/qtquick3d b/qtquick3d index e9d369a6..16753c36 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e9d369a6e0d3bb7e8728b25d19ff38a9f38f96f2 +Subproject commit 16753c36eb95e26918dc177df503ac3247097250 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9798d2f7..59da9f38 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9798d2f7e44bac551d8d3ce235916ca82bd8913c +Subproject commit 59da9f38d56a4bda354f962b8a06cd519b4b4ba6 diff --git a/qtquicktimeline b/qtquicktimeline index fe7ce0e2..b116f44b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit fe7ce0e234ae8f302173d1d10fe1be3982b84327 +Subproject commit b116f44b861c1ea0405f79952c850316fd9ec70e diff --git a/qtshadertools b/qtshadertools index d1f451e7..0967cbdc 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit d1f451e73ced4a1e6a84572b174d709d7d76b90e +Subproject commit 0967cbdc20c234685bd11d6ce022db92c00ffe29 diff --git a/qtsvg b/qtsvg index 7380fa91..706583b0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7380fa91685edf4feac7bd024786533c1ca46be9 +Subproject commit 706583b0e7ee81457a6770c726aac7072e947fb1 diff --git a/qttools b/qttools index baccc62e..359e8860 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit baccc62ed22f4eb0ddc63dd86b7d8f28eef45583 +Subproject commit 359e88600883b037d891faffbd100d9a143e95d7 diff --git a/qttranslations b/qttranslations index 144f84d3..c2dcc34d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 144f84d3761208a66ae80adca58f2897a25d3d10 +Subproject commit c2dcc34d4b09912b21ac9e6d803967691ec74f07 diff --git a/qtwayland b/qtwayland index 740e5ba7..3ec95f20 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 740e5ba7e25a5112888af8cc74f075f344a9c42b +Subproject commit 3ec95f207cc7fe776e740b5cf301c7ee67f9a1c8 -- cgit v1.2.3 From a41f41590bee4c1140b5adde0a77e52014478eea Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 25 Feb 2021 08:53:08 +0200 Subject: Change GCC version to 8.3.0 for Ubuntu 18.04 We need to use gcc 8 instead of 9 so that the Qt installer will work with CentOS 8.3 which have gcc 8 in the system. If we use newer gcc version with the binaries there will be issues with libstdc++. Using gcc-toolset-9 in CentOS won't help either because it will link libstdc++ against the one in system. Task-number: QTBUG-91352 Change-Id: I2a3d186bc04b1f54f14ed95f0588d18bd63814c4 Reviewed-by: Ville Voutilainen (cherry picked from commit 8843f5186646722a48e1915cf2844d6d5b7f6466) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/gcc.sh | 4 ++-- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 0d9c038a..08920669 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## 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. @@ -57,7 +57,7 @@ function InstallGCC() { suffixVersion=$(echo "$version" | cut -d "." -f1,2) sourceFile="gcc-$version.tar.xz" cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile" - officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile" + officialUrl="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz" targetFile="$tmpFolder/$sourceFile" buildFolder="$HOME/gcc_build" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 15142600..744228d7 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,4 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0 +InstallGCC 8.3.0 50 ccccfe4fe9206d111a173c19a21f8700d1133ae8 c27f4499dd263fe4fb01bcc5565917f3698583b2 -- cgit v1.2.3 From 598a978aec1bfd0414913b3b3fb1f688ff56c0f9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 4 Mar 2021 05:45:23 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I517d4c07abce5ad46e086e4bb2bc11f8cf83ca31 Reviewed-by: Qt Submodule Update Bot --- qtdoc | 2 +- qtquick3d | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtdoc b/qtdoc index a0f6a9b9..bb0d036d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a0f6a9b9fb6823faf2195072b978aa67a08b5f2a +Subproject commit bb0d036d2dcdb0b3fc29b82ce3bfa09c78b59872 diff --git a/qtquick3d b/qtquick3d index 16753c36..9457bd10 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 16753c36eb95e26918dc177df503ac3247097250 +Subproject commit 9457bd103581595dfd6e77af9883b0551ad61bad -- cgit v1.2.3 From dfd068a1595947187e6fe2d1f6523f48e6284ec7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 4 Mar 2021 10:03:55 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I2578a59e7703b50da1726f68841f34a644f88983 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index 7d288b69..7547b02a 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 7d288b69f695b4fa99e207393a30f31239f16e17 +Subproject commit 7547b02ac630ff1427181a67f744c534c07c120b diff --git a/qtbase b/qtbase index cfe5b1b8..5af06405 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cfe5b1b8dd04b98a229b53bb1474cae2b5731395 +Subproject commit 5af06405a61a571fd79f186bf535d9fab957bec1 diff --git a/qtdeclarative b/qtdeclarative index 7a089f77..aa23f786 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7a089f779c756800a24e04f1b748173709ac7826 +Subproject commit aa23f786dee088480cd5b25a3e3ff7405d4c4b1c diff --git a/qtdoc b/qtdoc index bb0d036d..dd117555 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bb0d036d2dcdb0b3fc29b82ce3bfa09c78b59872 +Subproject commit dd11755558a58c0a32c8e96b73c4e7687e5aec25 diff --git a/qtquick3d b/qtquick3d index 9457bd10..0c193357 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9457bd103581595dfd6e77af9883b0551ad61bad +Subproject commit 0c193357c9f3c349141faa7942e51cb128ca5bad diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 59da9f38..dc2c94d0 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 59da9f38d56a4bda354f962b8a06cd519b4b4ba6 +Subproject commit dc2c94d0bd67c9b5e6a80b9c7471bb8b33c3e443 diff --git a/qtquicktimeline b/qtquicktimeline index b116f44b..16f048a3 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit b116f44b861c1ea0405f79952c850316fd9ec70e +Subproject commit 16f048a32d69163307e46c8d1e5cb1840142c09a diff --git a/qtshadertools b/qtshadertools index 0967cbdc..35fbe7a4 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 0967cbdc20c234685bd11d6ce022db92c00ffe29 +Subproject commit 35fbe7a4de1b74c64bf039041411a8f350705aba diff --git a/qtsvg b/qtsvg index 706583b0..42a707f0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 706583b0e7ee81457a6770c726aac7072e947fb1 +Subproject commit 42a707f0380a8e2b332e2bea82c53f7648f60143 diff --git a/qttools b/qttools index 359e8860..562331dd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 359e88600883b037d891faffbd100d9a143e95d7 +Subproject commit 562331dd0f5402e945b82b78eccc724bc9b751a5 diff --git a/qttranslations b/qttranslations index c2dcc34d..5422d651 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c2dcc34d4b09912b21ac9e6d803967691ec74f07 +Subproject commit 5422d65182ed93a20f62623ebc3fe51943de7cab diff --git a/qtwayland b/qtwayland index 3ec95f20..9e83742c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3ec95f207cc7fe776e740b5cf301c7ee67f9a1c8 +Subproject commit 9e83742c912e02feeb55071b96664bffa0b02915 -- cgit v1.2.3 From ed885dcd9600ff5751a2e16d83c4d4e214f5bf33 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Mar 2021 16:05:36 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I3dbcbdbe64160ff1fc0dba5d8da2d3f9766d2e7d Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 7547b02a..695ecf02 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 7547b02ac630ff1427181a67f744c534c07c120b +Subproject commit 695ecf02e53bc975f7a0fd77fea0019de2cc7a64 diff --git a/qtbase b/qtbase index 5af06405..8b837ad0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5af06405a61a571fd79f186bf535d9fab957bec1 +Subproject commit 8b837ad05b9f7e74ebed7b97b7d22aa1e0fae4f1 diff --git a/qtdeclarative b/qtdeclarative index aa23f786..95dc1fa0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aa23f786dee088480cd5b25a3e3ff7405d4c4b1c +Subproject commit 95dc1fa0e9077adf82df3c463bb1b984e5801e12 diff --git a/qtdoc b/qtdoc index dd117555..e0041f80 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dd11755558a58c0a32c8e96b73c4e7687e5aec25 +Subproject commit e0041f80a8fd8546f187c71af263501e127eb67f diff --git a/qtqa b/qtqa index c435a78d..098cd96d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c435a78d312350451dda705d458daa7cdb1f7d77 +Subproject commit 098cd96d678ca23f20065cc9915ef2b45a6fef31 diff --git a/qtquick3d b/qtquick3d index 0c193357..50db4d60 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0c193357c9f3c349141faa7942e51cb128ca5bad +Subproject commit 50db4d60726892d7471fe80cc2890fbecd5344d0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index dc2c94d0..188246c5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit dc2c94d0bd67c9b5e6a80b9c7471bb8b33c3e443 +Subproject commit 188246c5e7767c0554dfc9286d87a7294a782a7b diff --git a/qtquicktimeline b/qtquicktimeline index 16f048a3..3b5d77d2 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 16f048a32d69163307e46c8d1e5cb1840142c09a +Subproject commit 3b5d77d26be02f3e758d5b59bae331a7667a08bc diff --git a/qtshadertools b/qtshadertools index 35fbe7a4..bd0db0e8 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 35fbe7a4de1b74c64bf039041411a8f350705aba +Subproject commit bd0db0e844fe1ea0556e5335b145af26fbd0f6d3 diff --git a/qtsvg b/qtsvg index 42a707f0..f3597255 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 42a707f0380a8e2b332e2bea82c53f7648f60143 +Subproject commit f35972554bec0c9ba6bdaae89510a33571c7fc98 diff --git a/qttools b/qttools index 562331dd..94bda8cb 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 562331dd0f5402e945b82b78eccc724bc9b751a5 +Subproject commit 94bda8cb6c275150733e7400e7d1ddd4513dcf93 diff --git a/qttranslations b/qttranslations index 5422d651..edff77ae 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 5422d65182ed93a20f62623ebc3fe51943de7cab +Subproject commit edff77ae64629243fa93181e1863ead21f7230a0 diff --git a/qtwayland b/qtwayland index 9e83742c..55530553 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9e83742c912e02feeb55071b96664bffa0b02915 +Subproject commit 55530553771b2166ce4ca263c7d15cc8612deda3 -- cgit v1.2.3 From 5dccb615d027a5f955a671795353f2a687ed9e6e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 Mar 2021 23:05:28 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Iae0b767cad3dc48eb369a810f3b4f60125646b3c Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index 695ecf02..794a14fd 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 695ecf02e53bc975f7a0fd77fea0019de2cc7a64 +Subproject commit 794a14fd1702b8a348c1bb45e763848d1fac740b diff --git a/qtbase b/qtbase index 8b837ad0..d12df462 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8b837ad05b9f7e74ebed7b97b7d22aa1e0fae4f1 +Subproject commit d12df462c3fa54afc4daff0e151106e2d42f98d5 diff --git a/qtdeclarative b/qtdeclarative index 95dc1fa0..d6f3ecc6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 95dc1fa0e9077adf82df3c463bb1b984e5801e12 +Subproject commit d6f3ecc670ac8b3531c784d184e8218815362d8f diff --git a/qtdoc b/qtdoc index e0041f80..5d82f0d9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e0041f80a8fd8546f187c71af263501e127eb67f +Subproject commit 5d82f0d938ded07c151b4de5c232784144add22f diff --git a/qtquick3d b/qtquick3d index 50db4d60..9f19674f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 50db4d60726892d7471fe80cc2890fbecd5344d0 +Subproject commit 9f19674fcd7f8cdc3ab63e3e9921bc19cb9cbcce diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 188246c5..9c8f3985 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 188246c5e7767c0554dfc9286d87a7294a782a7b +Subproject commit 9c8f39850118e3c7acfd7fffd9820e0a316c774b diff --git a/qtquicktimeline b/qtquicktimeline index 3b5d77d2..2341515d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 3b5d77d26be02f3e758d5b59bae331a7667a08bc +Subproject commit 2341515d75a34286377eb0d4f44159b4cab25e84 diff --git a/qtshadertools b/qtshadertools index bd0db0e8..2fe1e215 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit bd0db0e844fe1ea0556e5335b145af26fbd0f6d3 +Subproject commit 2fe1e215afb217557cb9f787ce3373e7e6c5d304 diff --git a/qtsvg b/qtsvg index f3597255..2ec96d62 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f35972554bec0c9ba6bdaae89510a33571c7fc98 +Subproject commit 2ec96d6265e0deb52a639257018bf4414826abea diff --git a/qttools b/qttools index 94bda8cb..6dd9c32c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 94bda8cb6c275150733e7400e7d1ddd4513dcf93 +Subproject commit 6dd9c32cc89dcfeece8dda8eb00bc186980f1c71 diff --git a/qttranslations b/qttranslations index edff77ae..98980e01 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit edff77ae64629243fa93181e1863ead21f7230a0 +Subproject commit 98980e01554f0304f97cec64ed8ed8ec15272a13 diff --git a/qtwayland b/qtwayland index 55530553..4aea2c14 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 55530553771b2166ce4ca263c7d15cc8612deda3 +Subproject commit 4aea2c1429fef365cbb93213bb10548524f1768e -- cgit v1.2.3 From 91d6371aa7ce1e710966a4f3334761e26c52b3d3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 6 Mar 2021 03:15:22 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I8647d06c7156328d1fdadd542e95158b62d00bfd Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index 794a14fd..fd312af9 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 794a14fd1702b8a348c1bb45e763848d1fac740b +Subproject commit fd312af94479775adee2dfb98b8e65772e11075c diff --git a/qtbase b/qtbase index d12df462..e4efa00c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d12df462c3fa54afc4daff0e151106e2d42f98d5 +Subproject commit e4efa00c72c7011f4e5c27722c2a522b30274610 diff --git a/qtdeclarative b/qtdeclarative index d6f3ecc6..ae30cfd7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d6f3ecc670ac8b3531c784d184e8218815362d8f +Subproject commit ae30cfd7d365dd6783c5868952381fc66130f9d0 diff --git a/qtdoc b/qtdoc index 5d82f0d9..aead5804 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5d82f0d938ded07c151b4de5c232784144add22f +Subproject commit aead58047edc1b6ec8bacdeba527c59258375f44 diff --git a/qtquick3d b/qtquick3d index 9f19674f..2a251c16 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9f19674fcd7f8cdc3ab63e3e9921bc19cb9cbcce +Subproject commit 2a251c162c37f093092fcf8d9ddeab5fc4d5823d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9c8f3985..d5a0f94a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9c8f39850118e3c7acfd7fffd9820e0a316c774b +Subproject commit d5a0f94aaee5e8dd8d30873b6e8de7b3b7f80484 diff --git a/qtquicktimeline b/qtquicktimeline index 2341515d..df546f84 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 2341515d75a34286377eb0d4f44159b4cab25e84 +Subproject commit df546f84fb3d85dd2602356f75b5e5829d460e68 diff --git a/qtshadertools b/qtshadertools index 2fe1e215..d8f8c3a9 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 2fe1e215afb217557cb9f787ce3373e7e6c5d304 +Subproject commit d8f8c3a90bc9c8a2eeb4715dbd3ab13adca7d4f5 diff --git a/qtsvg b/qtsvg index 2ec96d62..01f0099e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2ec96d6265e0deb52a639257018bf4414826abea +Subproject commit 01f0099ec293f7af606e41ac58682e14d1259ef2 diff --git a/qttools b/qttools index 6dd9c32c..bed50753 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6dd9c32cc89dcfeece8dda8eb00bc186980f1c71 +Subproject commit bed5075356f00cc3efee9c2f8d6430a5fc78b0b0 diff --git a/qttranslations b/qttranslations index 98980e01..851453a4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 98980e01554f0304f97cec64ed8ed8ec15272a13 +Subproject commit 851453a4ccf1b3748b05bd98b43d6ce79cd5567a diff --git a/qtwayland b/qtwayland index 4aea2c14..15b2b793 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4aea2c1429fef365cbb93213bb10548524f1768e +Subproject commit 15b2b79319fea492bdfb77eb124476f619d8de6b -- cgit v1.2.3 From a0fa9081c2de5224baef0f3227e34a01d9af307a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 6 Mar 2021 07:02:48 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I78ea65c2c25e20c29a9b636dd6649ef98d8189d2 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index fd312af9..d7824387 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit fd312af94479775adee2dfb98b8e65772e11075c +Subproject commit d7824387153449614edfa3f9ed93869e3595709c diff --git a/qtbase b/qtbase index e4efa00c..4387b9ff 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e4efa00c72c7011f4e5c27722c2a522b30274610 +Subproject commit 4387b9ffea15d853bdb1df83b2844f134a8e943e diff --git a/qtdeclarative b/qtdeclarative index ae30cfd7..2566150f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ae30cfd7d365dd6783c5868952381fc66130f9d0 +Subproject commit 2566150ffb6ab00eaab3f3ace48d8775eff0c550 diff --git a/qtdoc b/qtdoc index aead5804..640e1ee4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aead58047edc1b6ec8bacdeba527c59258375f44 +Subproject commit 640e1ee4c179b93d579ed29b2e8a71f96f9fd727 diff --git a/qtquick3d b/qtquick3d index 2a251c16..6e74e878 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2a251c162c37f093092fcf8d9ddeab5fc4d5823d +Subproject commit 6e74e878fd708ee48b31a52c5e734fedef7c97b2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d5a0f94a..f1c5cbe2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d5a0f94aaee5e8dd8d30873b6e8de7b3b7f80484 +Subproject commit f1c5cbe20a7efc63e4cef81cc459500deb7c7b1c diff --git a/qtquicktimeline b/qtquicktimeline index df546f84..901fbd17 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit df546f84fb3d85dd2602356f75b5e5829d460e68 +Subproject commit 901fbd172612414e7f10381de67f74d4405f78ac diff --git a/qtshadertools b/qtshadertools index d8f8c3a9..187f5a76 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit d8f8c3a90bc9c8a2eeb4715dbd3ab13adca7d4f5 +Subproject commit 187f5a7681386c2fa9354def8490372ff7f76c17 diff --git a/qtsvg b/qtsvg index 01f0099e..f5d50bc3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 01f0099ec293f7af606e41ac58682e14d1259ef2 +Subproject commit f5d50bc361a4e5541bdaa18bb81bb12292734db8 diff --git a/qttools b/qttools index bed50753..96699edd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bed5075356f00cc3efee9c2f8d6430a5fc78b0b0 +Subproject commit 96699edd0c19df7a3af345790421897721c7ade6 diff --git a/qttranslations b/qttranslations index 851453a4..396fa9dd 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 851453a4ccf1b3748b05bd98b43d6ce79cd5567a +Subproject commit 396fa9dd6ac45b9ab2609a65f183acc3ecda5ebd diff --git a/qtwayland b/qtwayland index 15b2b793..6aa07110 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 15b2b79319fea492bdfb77eb124476f619d8de6b +Subproject commit 6aa07110bfd23b472604d463c9e6c282a730d858 -- cgit v1.2.3 From fb46ac46982a014708a8701d65fd7484db60dad1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Mar 2021 05:45:14 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: Iefdb21860cbf8053c9fff29333865d7bece0c673 Reviewed-by: Qt Submodule Update Bot --- qtquick3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquick3d b/qtquick3d index 6e74e878..1339542c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6e74e878fd708ee48b31a52c5e734fedef7c97b2 +Subproject commit 1339542c688fb1187aed441f38754c04af58043a -- cgit v1.2.3 From 4e2b9e05522e451786bb0231d62dc000e058d3e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Mar 2021 10:32:32 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I4d0d734391d36ab806e6a955ebe1cc2668ea1285 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtrepotools | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt5compat b/qt5compat index d7824387..daadd404 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit d7824387153449614edfa3f9ed93869e3595709c +Subproject commit daadd40413862c8a76a0841257ad7674b8619b0a diff --git a/qtbase b/qtbase index 4387b9ff..4581f14f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4387b9ffea15d853bdb1df83b2844f134a8e943e +Subproject commit 4581f14ffdcb35f3291606d06f597cf991f20051 diff --git a/qtdeclarative b/qtdeclarative index 2566150f..a06dda1b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2566150ffb6ab00eaab3f3ace48d8775eff0c550 +Subproject commit a06dda1b898ccf4c2fbb947dc55e45c40c3c2772 diff --git a/qtdoc b/qtdoc index 640e1ee4..947e3d3b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 640e1ee4c179b93d579ed29b2e8a71f96f9fd727 +Subproject commit 947e3d3bfabed6da1f22086e2f90bf1864448bc2 diff --git a/qtqa b/qtqa index 098cd96d..c9f9df43 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 098cd96d678ca23f20065cc9915ef2b45a6fef31 +Subproject commit c9f9df436c2e2532704b8877f1613e6f68b7a800 diff --git a/qtquick3d b/qtquick3d index 1339542c..7efabdc4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1339542c688fb1187aed441f38754c04af58043a +Subproject commit 7efabdc4d1ae63ce3c47bbf3b11058c56609ed55 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f1c5cbe2..b482f194 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f1c5cbe20a7efc63e4cef81cc459500deb7c7b1c +Subproject commit b482f194f7a058d8312e3a274f0af448c21bea4f diff --git a/qtquicktimeline b/qtquicktimeline index 901fbd17..5aea12e8 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 901fbd172612414e7f10381de67f74d4405f78ac +Subproject commit 5aea12e81f817476334cb1c1a56ceacadd08f0d8 diff --git a/qtrepotools b/qtrepotools index a829867f..1af97221 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a829867f0873227451099d77597706b5efb5ed10 +Subproject commit 1af97221c58fff342094b14a2c803aa169cb6de9 diff --git a/qtshadertools b/qtshadertools index 187f5a76..463191dd 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 187f5a7681386c2fa9354def8490372ff7f76c17 +Subproject commit 463191dd047941e8e51b6648dd53e52ead48f26b diff --git a/qtsvg b/qtsvg index f5d50bc3..60dc922e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f5d50bc361a4e5541bdaa18bb81bb12292734db8 +Subproject commit 60dc922e01ecfc121ba6b4013d645672b0ebef2e diff --git a/qttools b/qttools index 96699edd..bf19b61b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 96699edd0c19df7a3af345790421897721c7ade6 +Subproject commit bf19b61b4508d606218b351f7e0628b2d6b489dd diff --git a/qttranslations b/qttranslations index 396fa9dd..bb1009fe 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 396fa9dd6ac45b9ab2609a65f183acc3ecda5ebd +Subproject commit bb1009fee0c1634947b5d0de76c94016f1ec1e78 diff --git a/qtwayland b/qtwayland index 6aa07110..6eff08d8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6aa07110bfd23b472604d463c9e6c282a730d858 +Subproject commit 6eff08d80ac4dd7acdf5f0beb4b0499fbf1db04a -- cgit v1.2.3 From 130388acbd9e119876706013092ff1005c7df2e5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 11 Mar 2021 09:41:48 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I99843339046d0bc00da17ce459896b8b1c234f85 Reviewed-by: Qt Submodule Update Bot --- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdoc b/qtdoc index 947e3d3b..c5f4347e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 947e3d3bfabed6da1f22086e2f90bf1864448bc2 +Subproject commit c5f4347e0cb2e3f785a8e905d0600bd1d4548e28 diff --git a/qtquick3d b/qtquick3d index 7efabdc4..24fc7cfa 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 7efabdc4d1ae63ce3c47bbf3b11058c56609ed55 +Subproject commit 24fc7cfa91320aebbe697a6ae4e2d278e1def10e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b482f194..140095b3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b482f194f7a058d8312e3a274f0af448c21bea4f +Subproject commit 140095b310a144740774b0a5c01af30e624eb8c7 -- cgit v1.2.3 From 5cd58bd851438de49f84a912039c251a89314c48 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Mar 2021 06:11:23 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I6b078f345acbf971be0947341b4085f86f67d4f9 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index daadd404..c241a7a2 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit daadd40413862c8a76a0841257ad7674b8619b0a +Subproject commit c241a7a2139c2e32555f62b547db4cfb0f997184 diff --git a/qtbase b/qtbase index 4581f14f..0a746371 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4581f14ffdcb35f3291606d06f597cf991f20051 +Subproject commit 0a7463715ae6acb50935b113768223ceddc50c93 diff --git a/qtdeclarative b/qtdeclarative index a06dda1b..afb4868a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a06dda1b898ccf4c2fbb947dc55e45c40c3c2772 +Subproject commit afb4868abeb15923ceb5080543f02e1262b29ed5 diff --git a/qtdoc b/qtdoc index c5f4347e..0f04b8ab 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c5f4347e0cb2e3f785a8e905d0600bd1d4548e28 +Subproject commit 0f04b8ab80dae49a986f5ef9a766c159eced8273 diff --git a/qtqa b/qtqa index c9f9df43..f9d0c48a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c9f9df436c2e2532704b8877f1613e6f68b7a800 +Subproject commit f9d0c48afce7365692d6464dc6490be12bfcf532 diff --git a/qtquick3d b/qtquick3d index 24fc7cfa..75cedcb0 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 24fc7cfa91320aebbe697a6ae4e2d278e1def10e +Subproject commit 75cedcb0b30f9bba541e19c2f1cc81f952ec91fa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 140095b3..d9e94e42 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 140095b310a144740774b0a5c01af30e624eb8c7 +Subproject commit d9e94e425f1fe76ecb8a96733249b5f628e68d13 diff --git a/qtquicktimeline b/qtquicktimeline index 5aea12e8..ddf1e00c 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 5aea12e81f817476334cb1c1a56ceacadd08f0d8 +Subproject commit ddf1e00c53169be20371912ec28e09e47a7e26de diff --git a/qtshadertools b/qtshadertools index 463191dd..ddcf522c 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 463191dd047941e8e51b6648dd53e52ead48f26b +Subproject commit ddcf522c30d212d83cefc121c3b531dc0992d39b diff --git a/qtsvg b/qtsvg index 60dc922e..30113477 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 60dc922e01ecfc121ba6b4013d645672b0ebef2e +Subproject commit 301134778a21a81bf450e609a7b24a02512ea521 diff --git a/qttools b/qttools index bf19b61b..de9db76c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bf19b61b4508d606218b351f7e0628b2d6b489dd +Subproject commit de9db76c6634a7d1ad4a55f815cd08ad54957ef7 diff --git a/qttranslations b/qttranslations index bb1009fe..03ca3db1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit bb1009fee0c1634947b5d0de76c94016f1ec1e78 +Subproject commit 03ca3db136edfec94c003759303c7c368daf6055 diff --git a/qtwayland b/qtwayland index 6eff08d8..79a3ee62 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6eff08d80ac4dd7acdf5f0beb4b0499fbf1db04a +Subproject commit 79a3ee6227eb778842e038df9a7af83b8b9dba35 -- cgit v1.2.3 From 6fe56028971aec91f954887e368e42f537e6caf0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 12 Mar 2021 11:08:11 +0200 Subject: Update submodules on '6.1' in qt/qt5 Change-Id: I06c3b417352b0deb875f0b04ba24d690d5cb7831 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index c241a7a2..9b831781 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit c241a7a2139c2e32555f62b547db4cfb0f997184 +Subproject commit 9b831781aa570b740ba799e7c2b5f88e1268ce10 diff --git a/qtbase b/qtbase index 0a746371..42f364c4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0a7463715ae6acb50935b113768223ceddc50c93 +Subproject commit 42f364c4945b7fe504817c5dc24f3ab8a4456dbd diff --git a/qtdeclarative b/qtdeclarative index afb4868a..9e9f889a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit afb4868abeb15923ceb5080543f02e1262b29ed5 +Subproject commit 9e9f889a631083ad3f78e7d975f4c8d3d6be39f2 diff --git a/qtdoc b/qtdoc index 0f04b8ab..9262c111 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0f04b8ab80dae49a986f5ef9a766c159eced8273 +Subproject commit 9262c1116b3786f8de8d7a2034e79360a0184ff9 diff --git a/qtquick3d b/qtquick3d index 75cedcb0..d18e63fe 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 75cedcb0b30f9bba541e19c2f1cc81f952ec91fa +Subproject commit d18e63fe06927550856279edf43cc00c6f08fec6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d9e94e42..cd960240 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d9e94e425f1fe76ecb8a96733249b5f628e68d13 +Subproject commit cd9602403587d0a44607a1fdd39439bc848a645e diff --git a/qtquicktimeline b/qtquicktimeline index ddf1e00c..a0e2a3c6 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ddf1e00c53169be20371912ec28e09e47a7e26de +Subproject commit a0e2a3c6ead0923057821fa9113897370c6d4f2b diff --git a/qtshadertools b/qtshadertools index ddcf522c..cfcf293a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ddcf522c30d212d83cefc121c3b531dc0992d39b +Subproject commit cfcf293ae59811044dd8960ca02cf5c1763abcec diff --git a/qtsvg b/qtsvg index 30113477..88797a3b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 301134778a21a81bf450e609a7b24a02512ea521 +Subproject commit 88797a3b223aa0e22a88fc87721348199cb9993e diff --git a/qttools b/qttools index de9db76c..f177fb14 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit de9db76c6634a7d1ad4a55f815cd08ad54957ef7 +Subproject commit f177fb1479f4f725e3833758326d80d96be3d17c diff --git a/qttranslations b/qttranslations index 03ca3db1..803996b7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 03ca3db136edfec94c003759303c7c368daf6055 +Subproject commit 803996b791d1860f5185726c5bd65c3a20d28213 diff --git a/qtwayland b/qtwayland index 79a3ee62..ddee808b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 79a3ee6227eb778842e038df9a7af83b8b9dba35 +Subproject commit ddee808b883ddfc899a418e7b490997218833185 -- cgit v1.2.3