diff options
Diffstat (limited to 'coin')
-rw-r--r-- | coin/platform_configs/default.yaml | 34 | ||||
-rw-r--r-- | coin/platform_configs/flashing-wizard.yaml | 8 | ||||
-rw-r--r-- | coin/platform_configs/meta-boot2qt.yaml | 10 | ||||
-rw-r--r-- | coin/platform_configs/qdb.yaml | 8 | ||||
-rw-r--r-- | coin/platform_configs/qt5.yaml | 10 | ||||
-rw-r--r-- | coin/platform_configs/qtbase.yaml | 8 | ||||
-rw-r--r-- | coin/platform_configs/qtdeclarative.yaml | 4 | ||||
-rw-r--r-- | coin/platform_configs/qtsaferenderer.yaml | 5 | ||||
-rw-r--r-- | coin/platform_configs/qtsdk.yaml | 4 | ||||
-rw-r--r-- | coin/platform_configs/qtwebkit.yaml | 2 | ||||
-rw-r--r-- | coin/platform_configs/tqtc-qt-config-gui.yaml | 10 | ||||
-rw-r--r-- | coin/platform_configs/tqtc-qt-rta.yaml | 5 |
12 files changed, 66 insertions, 42 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 22dde208..ee2eb2d5 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -4,77 +4,79 @@ Configurations: - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw73' + Features: ['UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2017' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' + Features: ['UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Features: ['OutOfSourceBuild', 'Documentation'] + Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', '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' Compiler: 'GCC' - Features: ['DisableTests'] + 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' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -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 -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Features: ['DisableTests'] + Features: ['DisableTests', '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' Target os: 'IOS_ANY' Target arch: 'multi' Compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' - Template: 'qtci-macos-10.14-x86_64' Target os: 'TvOS_ANY' Target arch: 'multi' Compiler: 'Clang' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang' - Template: 'qtci-macos-10.14-x86_64' Target os: 'WatchOS_ANY' Target arch: 'multi' Compiler: 'Clang' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' - Template: 'qtci-linux-RHEL-7.6-x86_64' @@ -82,13 +84,14 @@ Configurations: Target arch: 'multi' Compiler: 'Clang' Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', '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 -no-qpa-platform-guard -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-r20 -android-ndk-host linux-x86_64' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' + Features: ['UseLegacyInstructions'] Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -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' - @@ -96,6 +99,7 @@ Configurations: Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' + Features: ['UseLegacyInstructions'] Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner'] 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-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' - @@ -103,9 +107,9 @@ Configurations: Target os: 'QEMU' Target arch: 'mips64' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] 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/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck'] + Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index f0f0e51d..c281bb86 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -4,20 +4,20 @@ Configurations: - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Target arch: 'x86' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-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-RHEL-7.6-x86_64' Compiler: 'GCC' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-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 -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck'] + Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/meta-boot2qt.yaml b/coin/platform_configs/meta-boot2qt.yaml index 95cc79c4..5b2b63db 100644 --- a/coin/platform_configs/meta-boot2qt.yaml +++ b/coin/platform_configs/meta-boot2qt.yaml @@ -2,39 +2,49 @@ Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET1' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET2' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET3' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET4' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET5' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET6' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET7' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET8' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET9' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'Yocto' Target arch: 'TARGET10' + Features: ['UseLegacyInstructions'] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index 02198976..d36a21d2 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -5,19 +5,19 @@ Configurations: Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2015' Target arch: 'x86' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-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-14' Compiler: 'MSVC2015' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-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-RHEL-7.6-x86_64' Compiler: 'GCC' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-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 -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck'] + Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 19eb1732..c98a351a 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,12 +1,12 @@ - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-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% -platform win32-g++' - Template: 'qtci-windows-10-x86_64-15' Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' - Template: 'qtci-windows-10-x86_64-15' @@ -14,7 +14,7 @@ Target arch: 'multi' Compiler: 'Mingw73' Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' - Template: 'qtci-macos-10.14-x86_64' @@ -22,11 +22,11 @@ Target arch: 'multi' Compiler: 'Clang' Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -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-r20 -android-ndk-host darwin-x86_64' - Template: 'qtci-macos-10.14-x86_64' Target os: 'WebAssembly' Compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -xplatform wasm-emscripten' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index cb45370a..01b5763d 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -1,20 +1,22 @@ +Version: 2 +Configurations: - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-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' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 161875d8..0d561b82 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -4,21 +4,25 @@ Target arch: 'armv7' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -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' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -R . -developer-build -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" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -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-xcb' + Features: ['UseLegacyInstructions'] diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index be14923b..63b2d0d3 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -2,13 +2,14 @@ Template: 'qtci-windows-10-x86_64-15' Compiler: 'Mingw73' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' + Features: ['UseLegacyInstructions'] - Template: 'qtci-windows-10-x86_64-15' Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-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-RHEL-7.6-x86_64' Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-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/qtsdk.yaml b/coin/platform_configs/qtsdk.yaml index 754e8492..1f1e35d1 100644 --- a/coin/platform_configs/qtsdk.yaml +++ b/coin/platform_configs/qtsdk.yaml @@ -2,12 +2,14 @@ Template: 'qtci-windows-10-x86-3' Compiler: 'MSVC2017' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' + Features: ['UseLegacyInstructions'] - Template: 'qtci-linux-RHEL-6.6-x86_64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests' + Features: ['UseLegacyInstructions'] - Template: 'qtci-windows-8.1-x86' Compiler: 'MSVC2015' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 0a1d5d31..87e6a322 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,5 +1,5 @@ - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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% -platform win32-g++' diff --git a/coin/platform_configs/tqtc-qt-config-gui.yaml b/coin/platform_configs/tqtc-qt-config-gui.yaml index da37d0e5..70471f1f 100644 --- a/coin/platform_configs/tqtc-qt-config-gui.yaml +++ b/coin/platform_configs/tqtc-qt-config-gui.yaml @@ -4,25 +4,25 @@ Configurations: - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2017' Target arch: 'x86' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -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-RHEL-7.6-x86_64' Compiler: 'GCC' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-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 -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Features: ['Packaging'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-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-18.04-x86_64' Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck'] + Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/tqtc-qt-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml index 76664d06..5f72bc29 100644 --- a/coin/platform_configs/tqtc-qt-rta.yaml +++ b/coin/platform_configs/tqtc-qt-rta.yaml @@ -1,14 +1,15 @@ - Template: 'qtci-windows-7-x86_64-4' Compiler: 'MSVC2013' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' - Template: 'qtci-windows-8.1-x86_64' Compiler: 'MSVC2013' - Features: ['DisableTests'] + Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' - Template: 'qtci-windows-10-x86-3' Compiler: 'MSVC2017' Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests' + Features: ['UseLegacyInstructions'] |