mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-10 22:36:09 +08:00
Compare commits
21 Commits
v6.0.0-alp
...
v6.0.0-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e9e821038c | ||
|
|
9251571a53 | ||
|
|
30eefe1877 | ||
|
|
8ce3f74ad0 | ||
|
|
93a167e28e | ||
|
|
f753ca6c30 | ||
|
|
6eea6ae689 | ||
|
|
f1e911e344 | ||
|
|
a892a2ca19 | ||
|
|
eb2295498f | ||
|
|
eaf64a222f | ||
|
|
70dc8438fc | ||
|
|
643172a8df | ||
|
|
ca02358af2 | ||
|
|
aee06febca | ||
|
|
3c27956017 | ||
|
|
04d7a43cd6 | ||
|
|
ab23bc2ecf | ||
|
|
758ea825b9 | ||
|
|
b7d0021d4f | ||
|
|
94f091907e |
6
.gitmodules
vendored
6
.gitmodules
vendored
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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']
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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'
|
||||
]
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
Version: 2
|
||||
Include: [cmake_platforms.yaml, cmake_platforms_qemu.yaml]
|
||||
Include: [cmake_platforms.yaml]
|
||||
Configurations: []
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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
|
||||
49
coin/provisioning/common/macos/ninja.sh
Executable file
49
coin/provisioning/common/macos/ninja.sh
Executable 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
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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/*
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/unix/install-openssl.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"
|
||||
10
coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-enable-modules.sh
Executable file
10
coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/01-enable-modules.sh
Executable 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
|
||||
|
||||
@@ -2,4 +2,7 @@
|
||||
|
||||
set -ex
|
||||
|
||||
brew install ninja
|
||||
# shellcheck source=../common/macos/ninja.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/ninja.sh"
|
||||
|
||||
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 3166eed9ec...dd698034fd
Submodule qt5compat updated: 763b161a90...1da66bfbab
2
qtbase
2
qtbase
Submodule qtbase updated: 8059632fbd...86d2f7f365
Submodule qtdeclarative updated: 3ff1cbd6c0...22e0701ee8
2
qtdoc
2
qtdoc
Submodule qtdoc updated: ae593af492...8805551ab3
Submodule qtimageformats updated: 7b41d70512...7cb70c7990
Submodule qtnetworkauth updated: c5218fd04a...e151a7afc6
2
qtqa
2
qtqa
Submodule qtqa updated: 78d37bb594...cc9edaa4ca
Submodule qtquick3d updated: 82a2d34faa...772fd7f3eb
Submodule qtquickcontrols2 updated: cd669f1f21...54bf57ec19
Submodule qtquicktimeline updated: 395c79681b...d55ca02534
Submodule qtshadertools updated: c3a93290c8...c096e4223b
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 494c555d39...be823374e9
2
qttools
2
qttools
Submodule qttools updated: c4e1721c24...9e0ce81d7a
Submodule qttranslations updated: 463a8c3c87...8c38aedb29
Submodule qtwayland updated: e823131e6f...84b330284a
Reference in New Issue
Block a user