Compare commits

..

21 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
e9e821038c Update submodules on 'dev' in qt/qt5
Change-Id: I4f15c08e1169408e001af516ef421c994f5b8f68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-16 08:23:04 +03:00
Cristian Adam
9251571a53 Qdoc_libclang: Install perl-Digest-MD5
While building Clang 11 for Qt the tests failed due to missing Perl
Digest-MD5 package.

Pick-to: 5.15
Change-Id: Iba4156db65ec53bf465ca5b132e6983f1176bc41
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-16 01:16:38 +02:00
Qt Submodule Update Bot
30eefe1877 Update submodules on 'dev' in qt/qt5
Change-Id: I32b601f60d996b456a8df68d087b35632e05a832
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-15 21:08:22 +03:00
Qt Submodule Update Bot
8ce3f74ad0 Update submodules on 'dev' in qt/qt5
Change-Id: Ib2c25ac40a076d7a76fe39ee76185d43ab00bed8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-15 12:02:55 +03:00
Heikki Halmet
93a167e28e Remove Android multi qmake for linux
Target are already ported to cmake and qmake
target is failing with CentOS which will replace
Redhat

Change-Id: I792ae826c96012a10050ca07a071e01780f54f0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-10-15 09:08:41 +03:00
Qt Submodule Update Bot
f753ca6c30 Update submodules on 'dev' in qt/qt5
Change-Id: I758524da0aa87f2bc2c08c1b25b904fd72f5e7e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-13 18:03:09 +03:00
Alexandru Croitor
6eea6ae689 CMake: Add missing qtbase macOS developer build configuration
Task-number: QTBUG-86053
Change-Id: I4fa4c03599e1a455eb1337d9980c2bda09cfd374
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-13 09:50:46 +02:00
Heikki Halmet
f1e911e344 Provisioning: Replace SLES-15 with SLES-15 SP2
Task-number: QTQAINFRA-3921
Change-Id: I325a4b8f272dda80168aed1389e647bbd525b10f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-12 19:28:28 +03:00
Jani Heikkinen
a892a2ca19 Remove unnecessary add-ons from .gitmodules
qt3d, qtimageformats and qtnetworkaut will be delivered via package
manager so those shouldn't be in qt5.git integrations from Qt 6.0 ->

Task-number: QTBUG-87255
Change-Id: I2ddaf561123153b78b4bd972c22a90ba1309a91d
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2020-10-12 19:28:10 +03:00
Qt Submodule Update Bot
eb2295498f Update submodules on 'dev' in qt/qt5
Change-Id: I292664713d16d1c149c5f65d23dab3dc29adce25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-12 19:28:10 +03:00
Joerg Bornemann
eaf64a222f CMake: Run auto-detection routines before any project command
This is needed to ensure that the auto-detection runs before any
toolchain file is loaded, like in a stand-alone qtbase build.

This fixes the issue that we had to specify ANDROID_STL=c++_shared in a
top-level build, even though it's properly defaulted in
QtAutoDetect.cmake.

Task-number: QTBUG-87309
Change-Id: I8ced2213ca2e5a877bfd210e59da4ef4d6c8ac74
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-12 18:28:10 +02:00
Joerg Bornemann
70dc8438fc CMake: Fix find_package puzzle piece of top-level cross-builds
The subdirectories, the top-level CMakeLists.txt adds, contain
find_package(Qt6 COMPONENTS ...) calls. When cross-compiling to Android,
the toolchain file sets CMAKE_FIND_ROOT_PATH and
CMAKE_FIND_ROOT_PATH_MODE to ONLY. That means, the packages that are
created in qtbase can never be found by other Qt repositories, e.g.
qtdeclarative.

Append the qtbase build dir to CMAKE_FIND_ROOT_PATH to find the Qt
packages of the build dir when cross-compiling. Because of some CMake
idiosyncracy, we need to append "${QtBase_BINARY_DIR}/lib/cmake" to
CMAKE_PREFIX_PATH and not just "${QtBase_BINARY_DIR}". See
qtbase/ec90f9013b4c6b63d7e03a964f66f97329be7885 for details.

Task-number: QTBUG-85080
Change-Id: I799f851316538c310d73f5ab59c809229e16e8a8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-12 18:28:10 +02:00
Joerg Bornemann
643172a8df CMake: Remove ${CMAKE_BINARY_DIR} from CMAKE_PREFIX_PATH
This is a left-over from before the bin, lib, ... directories were moved
to the qtbase build directory.

Change-Id: I24bfa36289648288b2b44cc809e0c390cd2c043b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-11 14:26:59 +02:00
Cristian Adam
ca02358af2 Provision RedHat libclang packages only for RedHat
While bulding on CentOS with Red Hat libclang packages we end up with
linker errors due to differences in C++ ABI used.

Ubuntu 18.04 package works fine with CentOS 8.1.

Task-number: QTBUG-86968
Change-Id: Idf0435a06046fb791b8ca1086e6465521ba6006a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-10-11 14:10:42 +02:00
Heikki Halmet
aee06febca Provisioning: Install Ninja binary
Install Ninja binary without using brew

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3954
Change-Id: I2f50814e26e756bbf5cf3d74a4a1c5c00426ab4a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-10-08 21:31:29 +03:00
Qt Submodule Update Bot
3c27956017 Update submodules on 'dev' in qt/qt5
Change-Id: Ic08739697c44645ff8aa168a3d1aefe5de9262d6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-07 15:08:37 +03:00
Tony Sarajärvi
04d7a43cd6 Add a Windows 10 developer build for MSVC2019
Task-number: QTQAINFRA-3759
Change-Id: I46cf3056f79c03dd3f6e62b8901a737d52c4e058
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-10-06 12:52:00 +00:00
Alexandru Croitor
ab23bc2ecf Disable warnings are errors for qemu configs
To get at least some build coverage in CI, otherwise it fails to build
in qtbase.

Task-number: QTBUG-83968
Change-Id: Ifc67d3e98c0a00ad94211f8d73efa30a35eb0e14
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-05 10:52:10 +02:00
Alexandru Croitor
758ea825b9 Disable usage of forkfd_pidfd in qemu configurations
qemu can't emulate the feature properly, and that causes many tests
that use QProcess to fail. Use the newly introduced feature in qtbase
to disable the feature for qemu configurations.

Task-number: QTBUG-86285
Task-number: QTBUG-86187
Task-number: QTBUG-86198
Change-Id: Iecd5c64f6f2e98e5c5ab893b50a1fee2bc10108f
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-05 10:52:07 +02:00
Alexandru Croitor
b7d0021d4f CMake: Add qemu arm64 and mips64 configurations
Task-number: QTBUG-83968
Change-Id: I80a8214890f61a879b0c83acb63cef2b7958f4e9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-05 10:52:05 +02:00
Alexandru Croitor
94f091907e CMake: Enable qemu armv7 configuration for all repos
Task-number: QTBUG-83968
Change-Id: I0aca9b5ff53b8383001030dc7f7555cc5aaf2be8
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-05 10:52:02 +02:00
49 changed files with 207 additions and 57 deletions

6
.gitmodules vendored
View File

@@ -131,13 +131,13 @@
path = qt3d
url = ../qt3d.git
branch = dev
status = addon
status = ignore
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = dev
status = addon
status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
@@ -284,7 +284,7 @@
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = dev
status = addon
status = ignore
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative

View File

@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.15.0)
include(${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/QtAutoDetect.cmake)
project(Qt
VERSION 6.0.0
DESCRIPTION "Qt Libraries"
@@ -48,8 +50,6 @@ endif()
include(ECMOptionalAddSubdirectory)
include(TopologicalSort)
# Use the CMake config files from the binary dir
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}")
# Also make sure the CMake config files do not recreate the already-existing targets
if (NOT QT_BUILD_STANDALONE_TESTS)
set(QT_NO_CREATE_TARGETS TRUE)
@@ -84,7 +84,8 @@ list(REMOVE_ITEM git_module_list qtbase)
add_subdirectory(qtbase)
if (NOT QT_BUILD_STANDALONE_TESTS)
list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}")
list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
endif()
foreach(module IN LISTS git_module_list)

View File

@@ -1,5 +1,6 @@
Version: 2
Include: [
cmake_platforms_qemu.yaml,
cmake_platforms_target_android_host_linux.yaml,
cmake_platforms_target_android_host_macos.yaml,
cmake_platforms_target_android_host_windows.yaml
@@ -28,7 +29,7 @@ Configurations:
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']
-
Template: 'qtci-linux-SLES-15-x86_64'
Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DBUILD_EXAMPLES=OFF -FEATURE_developer_build=ON -DBUILD_WITH_PCH=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
@@ -57,6 +58,12 @@ Configurations:
Features: ['Packaging']
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=']
-
Template: 'qtci-windows-10-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Insignificant']
Configure arguments: '-G"Ninja Multi-Config" -DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=']
-
Id: 'RHEL-7.6-host'
Template: 'qtci-linux-RHEL-7.6-x86_64'

View File

@@ -7,6 +7,45 @@ Configurations:
Compiler: 'GCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache', 'Insignificant']
Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.18.3/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software', 'NON_QTBASE_CONFIGURE_ARGS=',
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -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_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi',
"QT_CMAKE_DIR=/opt/cmake-3.18.3/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache', 'Insignificant']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -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_SYSROOT}}/../../environment-setup-aarch64-poky-linux',
"QT_CMAKE_DIR=/opt/cmake-3.18.3/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'mips64'
Compiler: 'GCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache', 'Insignificant', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -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_SYSROOT}}/../../environment-setup-mips64r2-poky-linux',
"QT_CMAKE_DIR=/opt/cmake-3.18.3/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
'QT_QUICK_BACKEND=software',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

View File

@@ -22,7 +22,7 @@ Configurations:
Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
-
Template: 'qtci-linux-SLES-15-x86_64'
Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
Compiler: 'GCC'
Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-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'
@@ -56,14 +56,6 @@ Configurations:
Target compiler: 'Clang'
Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r21d -android-ndk-host darwin-x86_64'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'GCC'
Target compiler: 'Clang'
Features: ['DisableTests', 'UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r21d -android-ndk-host linux-x86_64'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
@@ -71,7 +63,7 @@ Configurations:
Compiler: 'GCC'
Features: ['UseLegacyInstructions', 'Insignificant']
Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
@@ -79,7 +71,7 @@ Configurations:
Compiler: 'GCC'
Features: ['UseLegacyInstructions', 'Insignificant']
Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
@@ -87,7 +79,7 @@ Configurations:
Compiler: 'GCC'
Features: ['DisableTests', 'UseLegacyInstructions']
Environment variables: ['QT_QUICK_BACKEND=software']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'

View File

@@ -1,5 +1,5 @@
Version: 2
Include: [cmake_platforms.yaml, cmake_platforms_qemu.yaml]
Include: [cmake_platforms.yaml]
Configurations:
-
Template: 'qtci-linux-openSUSE-15.1-x86_64'
@@ -12,3 +12,12 @@ Configurations:
Compiler: 'Clang'
Features: ['UseLegacyInstructions']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
-
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Sccache']
Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -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'
]

View File

@@ -1,3 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml, cmake_platforms_qemu.yaml]
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -50,7 +50,7 @@ Configurations:
Compiler: 'GCC'
Features: ['UseLegacyInstructions', 'Insignificant']
Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
@@ -58,7 +58,7 @@ Configurations:
Compiler: 'GCC'
Features: ['UseLegacyInstructions', 'Insignificant']
Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'

View File

@@ -0,0 +1,47 @@
### SUSE Linux Enterprise Desktop 15 SP2 ###
Language: English (US)
Keyboard Layout: English (US)
Available Extensions and Modules:
Basesystem Module
Desktop Applications Module
Python 2 Module
Gnome Desktop (X11)
Resolution 1280x800
# Settings
Notification Popups - disabled
LockScreen Notifications - disabled
# Privacy
Screen Lock - Off
# Power
Power Saving - Blank Screen - never
# 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
sudo ./coin-setup
# Add support for virtio driver
sudo echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
sudo dracut -f
# Add these to '/etc/polkit-default-privs.local'
org.freedesktop.udisks2.filesystem-mount yes
org.freedesktop.udisks2.filesystem-mount-other-seat yes
org.freedesktop.udisks2.filesystem-mount-system yes
org.freedesktop.login1.power-off yes
org.freedesktop.login1.power-off-ignore-inhibit yes
org.freedesktop.login1.power-off-multiple-sessions yes
# Register product
# Add 'Available Extensions and Modules'
* Basesystem Module 15 SP2 x86_64
* Server Applications Module 15 SP2 x86_64

View File

@@ -0,0 +1,49 @@
#!/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 will install ninja binary
# shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
version="1.10.1"
internalUrl="http://ci-files01-hki.ci.local/input/mac/ninja-mac_v${version}.zip"
externalUrl="https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-mac.zip"
SHA1="de7c594e3bf76f7c86b9d6874d49c8824b2a76e1"
DestDir="/usr/local/bin/"
InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""
echo "Ninja = $version" >> ~/versions.txt

View File

@@ -2,7 +2,7 @@
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## 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.
@@ -54,7 +54,7 @@ if uname -a |grep -q Darwin; then
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"
elif test -f /etc/redhat-release; then
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"
@@ -70,7 +70,11 @@ zip="/tmp/libclang.7z"
destination="/usr/local/libclang-$version"
DownloadURL $url_cached $url $sha1 $zip
sudo 7z x $zip -o/usr/local/
if command -v 7zr &> /dev/null; then
sudo 7zr x $zip -o/usr/local/
else
sudo 7z x $zip -o/usr/local/
fi
sudo mv /usr/local/libclang "$destination"
rm -rf $zip

View File

@@ -93,6 +93,8 @@ installPackages+=(rh-nodejs12-nodejs-devel)
installPackages+=(java-1.8.0-openjdk-devel)
# For receiving shasum
installPackages+=(perl-Digest-SHA)
# For Clang 11 tests
installPackages+=(perl-Digest-MD5)
# INTEGRITY requirements
installPackages+=(glibc.i686)
# Enable Qt Bluetooth

View File

@@ -1,7 +0,0 @@
#!/usr/bin/env bash
set -ex
# this script will remove executable rights from cron.daily jobs
sudo chmod -x /etc/cron.daily/*

View File

@@ -1,6 +0,0 @@
#!/bin/bash
set -ex
# shellcheck source=../common/unix/install-openssl.sh
source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

View File

@@ -0,0 +1,10 @@
#!/usr/bin/env bash
set -ex
# Activate these modules
# Note! Modules'Server Applications Module 15 SP2 x86_64' & 'Server Applications Module 15 SP2 x86_64' were enabled during registrarion phase
sudo SUSEConnect -p sle-module-desktop-applications/15.2/x86_64
sudo SUSEConnect -p sle-module-development-tools/15.2/x86_64
sudo SUSEConnect --product sle-module-python2/15.2/x86_64

View File

@@ -2,4 +2,7 @@
set -ex
brew install ninja
# shellcheck source=../common/macos/ninja.sh
source "${BASH_SOURCE%/*}/../common/macos/ninja.sh"

2
qt3d

Submodule qt3d updated: 3166eed9ec...dd698034fd

2
qtbase

Submodule qtbase updated: 8059632fbd...86d2f7f365

2
qtdoc

Submodule qtdoc updated: ae593af492...8805551ab3

2
qtqa

Submodule qtqa updated: 78d37bb594...cc9edaa4ca

2
qtsvg

Submodule qtsvg updated: 494c555d39...be823374e9

Submodule qttools updated: c4e1721c24...9e0ce81d7a