diff options
77 files changed, 276 insertions, 414 deletions
diff --git a/.gitmodules b/.gitmodules index ef01576e..a161c519 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,47 +1,47 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = wip/cmake status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = wip/cmake status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = wip/cmake status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git branch = dev - status = addon + status = ignore [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git branch = dev - status = deprecated + status = ignore [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = dev - status = essential + status = ignore [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = wip/cmake status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -49,13 +49,13 @@ path = qtxmlpatterns url = ../qtxmlpatterns.git branch = dev - status = deprecated + status = ignore [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git branch = dev - status = essential + status = ignore priority = 30 [submodule "qtdoc"] depends = qtdeclarative qttools @@ -63,7 +63,7 @@ path = qtdoc url = ../qtdoc.git branch = dev - status = essential + status = ignore priority = 40 [submodule "qtrepotools"] path = qtrepotools @@ -76,7 +76,7 @@ path = qtqa url = ../qtqa.git branch = master - status = essential + status = ignore priority = 50 [submodule "qtlocation"] depends = qtbase @@ -84,14 +84,14 @@ path = qtlocation url = ../qtlocation.git branch = dev - status = addon + status = ignore [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = dev - status = addon + status = ignore [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative @@ -123,7 +123,7 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = wip/cmake status = addon [submodule "qtwayland"] depends = qtbase @@ -131,25 +131,25 @@ path = qtwayland url = ../qtwayland.git branch = dev - status = addon + status = ignore [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git branch = dev - status = addon + status = ignore [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = wip/cmake status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = wip/cmake status = addon [submodule "qtquickcontrols"] depends = qtdeclarative @@ -157,32 +157,32 @@ path = qtquickcontrols url = ../qtquickcontrols.git branch = dev - status = addon + status = ignore [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = wip/cmake status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = wip/cmake status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = wip/cmake status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git branch = dev - status = addon + status = ignore [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia @@ -195,13 +195,13 @@ path = qtandroidextras url = ../qtandroidextras.git branch = dev - status = addon + status = ignore [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = wip/cmake status = addon [submodule "qtwebchannel"] depends = qtbase @@ -209,14 +209,14 @@ path = qtwebchannel url = ../qtwebchannel.git branch = dev - status = addon + status = ignore [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git branch = dev - status = addon + status = ignore priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative @@ -230,13 +230,13 @@ path = qtwebview url = ../qtwebview.git branch = dev - status = addon + status = ignore [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = wip/cmake status = essential [submodule "qtpurchasing"] depends = qtbase @@ -244,40 +244,40 @@ path = qtpurchasing url = ../qtpurchasing.git branch = dev - status = addon + status = ignore [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git branch = dev - status = addon + status = ignore [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git branch = dev - status = addon + status = ignore [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git branch = dev - status = addon + status = ignore [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev + branch = wip/cmake status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = wip/cmake status = addon [submodule "qtspeech"] depends = qtbase @@ -285,12 +285,12 @@ path = qtspeech url = ../qtspeech.git branch = dev - status = addon + status = ignore [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = wip/cmake status = addon [submodule "qtremoteobjects"] depends = qtbase @@ -305,22 +305,22 @@ path = qtwebglplugin url = ../qtwebglplugin.git branch = dev - status = addon + status = ignore [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git branch = dev - status = preview + status = ignore [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline branch = dev - status = preview + status = ignore [submodule "qtquick3d"] depends = qtbase qtdeclarative path = qtquick3d url = ../qtquick3d.git branch = dev - status = preview + status = ignore diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 00000000..d10eb769 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,10 @@ +version: 1 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +build_instructions: + - type: EnvironmentVariable + variableName: Dummy + variableValue: dummy diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 753578a2..46fe6ecd 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,123 +1,30 @@ Version: 2 -Module only: True Configurations: - - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' - 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'] - 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'] - 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' - 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'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON' - Template: 'qtci-linux-openSUSE-15.0-x86_64' Compiler: 'ICC_18' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -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'] - 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'] - 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'] - 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' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' - Features: ['Packaging'] - 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'] - 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'] - 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'] - 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' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode10.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12' - - Template: 'qtci-macos-10.14-x86_64' - Target os: 'TvOS_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Features: ['DisableTests'] - 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'] - 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-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake' - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - 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' - 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' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'arm64' - Compiler: 'GCC' - 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' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'mips64' - Compiler: 'GCC' - Features: ['DisableTests'] - 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'] + Configure arguments: '-DBUILD_EXAMPLES=OFF' - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'armv7' + Target os: 'Android_ANY' + Target arch: 'arm64' Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DVCPKG_TARGET_TRIPLET=arm64-android -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU'] diff --git a/coin/platform_configs/meta-boot2qt.yaml b/coin/platform_configs/meta-boot2qt.yaml deleted file mode 100644 index 95cc79c4..00000000 --- a/coin/platform_configs/meta-boot2qt.yaml +++ /dev/null @@ -1,40 +0,0 @@ -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET1' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET2' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET3' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET4' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET5' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET6' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET7' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET8' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET9' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Compiler: 'Yocto' - Target arch: 'TARGET10' diff --git a/coin/platform_configs/ogl-runtime.yaml b/coin/platform_configs/ogl-runtime.yaml deleted file mode 100644 index c1ec5493..00000000 --- a/coin/platform_configs/ogl-runtime.yaml +++ /dev/null @@ -1 +0,0 @@ -qt5.yaml diff --git a/coin/platform_configs/qt3d-runtime.yaml b/coin/platform_configs/qt3d-runtime.yaml deleted file mode 100644 index c1ec5493..00000000 --- a/coin/platform_configs/qt3d-runtime.yaml +++ /dev/null @@ -1 +0,0 @@ -qt5.yaml diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml deleted file mode 100644 index e1d20a71..00000000 --- a/coin/platform_configs/qt5.yaml +++ /dev/null @@ -1,106 +0,0 @@ -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'WinRT_10' - Compiler: 'MSVC2015' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'WinRT_10' - Target arch: 'x86' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017' -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - 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'] - 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' - Target os: 'WinRT_10' - Target arch: 'armv7' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'WinRT_10' - Compiler: 'MSVC2017' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'Mingw73' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - 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.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - 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.13-x86_64-2' - Target os: 'QNX_700' - Target arch: 'x86' - Compiler: 'GCC' - Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'QNX_700' - Target arch: 'armv7' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'armv8' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc' -- - Template: 'qtci-linux-RHEL-7.6-x86_64' - Target os: 'QNX_700' - Target arch: 'x86_64' - Compiler: 'GCC' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' -- - Template: 'qtci-windows-10-x86_64-15' - Target os: 'WebAssembly' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\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 -platform win32-g++ -xplatform wasm-emscripten' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'WebAssembly' - Compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - 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 deleted file mode 100644 index cb45370a..00000000 --- a/coin/platform_configs/qtbase.yaml +++ /dev/null @@ -1,20 +0,0 @@ -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'armv7' - Compiler: 'GCC' - Features: ['DisableTests'] - 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'] - 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'] - 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 deleted file mode 100644 index 161875d8..00000000 --- a/coin/platform_configs/qtdeclarative.yaml +++ /dev/null @@ -1,24 +0,0 @@ -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - 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' -- - 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' -- - 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' -- - 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' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml deleted file mode 100644 index be14923b..00000000 --- a/coin/platform_configs/qtsaferenderer.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- - 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++' -- - Template: 'qtci-windows-10-x86_64-15' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - 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'] - 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 deleted file mode 100644 index 754e8492..00000000 --- a/coin/platform_configs/qtsdk.yaml +++ /dev/null @@ -1,13 +0,0 @@ -- - 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' -- - 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' -- - Template: 'qtci-windows-8.1-x86' - Compiler: 'MSVC2015' - Features: ['DisableTests'] - 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 deleted file mode 100644 index 0a1d5d31..00000000 --- a/coin/platform_configs/qtwebkit.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- - Template: 'qtci-windows-7-x86-3' - Compiler: 'Mingw73' - Features: ['Packaging', 'DisableTests'] - 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-rta.yaml b/coin/platform_configs/tqtc-qt-rta.yaml deleted file mode 100644 index 76664d06..00000000 --- a/coin/platform_configs/tqtc-qt-rta.yaml +++ /dev/null @@ -1,14 +0,0 @@ -- - Template: 'qtci-windows-7-x86_64-4' - Compiler: 'MSVC2013' - Features: ['DisableTests'] - 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'] - 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' diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index a3b2a9cc..38c515a6 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -33,7 +33,7 @@ ## ############################################################################# -# This script installs CMake 3.7.2 +# This script installs CMake 3.15.0-rc1 # CMake is needed for autotests that verify that Qt can be built with CMake @@ -42,10 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="3.7.2" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.7.2-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz" -SHA1="915bc981aab354821fb9fd28374a720fdb3aa180" +majorminorversion="3.15" +version="3.15.5" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" +SHA1="867f44e232346b79167b64cb5380bc0955e953fb" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-Linux-x86_64" diff --git a/coin/provisioning/common/linux/vcpkg.sh b/coin/provisioning/common/linux/vcpkg.sh new file mode 100755 index 00000000..35f2ece8 --- /dev/null +++ b/coin/provisioning/common/linux/vcpkg.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 The Qt Company Ltd. +## Contact: https://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 + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +# This script installs VcPkg. It is used to provide third-party libraries when cross-compiling +# for example for Emscripten or Android. + +# Refresh to make sure we have the EMSCRIPTEN environment variable, needed for the vcpkg wasm build. +source ~/.bashrc + +source "${BASH_SOURCE%/*}/../shared/vcpkg_version.txt" + +officialUrl="https://codeload.github.com/tronical/vcpkg/tar.gz/$vcpkg_version" +targetFile="vcpkg.tar.gz" +targetFolder="$HOME/vcpkg" + +wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$officialUrl" + +if [ ! -d "${targetFolder}" ]; then + mkdir -p $targetFolder +fi + +tar -C $targetFolder --strip-components=1 -xvzf $targetFile +rm -rf $targetFile + +SetEnvVar "VCPKG_ROOT" "$targetFolder" + +cd $targetFolder +./bootstrap-vcpkg.sh + +./vcpkg install --triplet arm-android @qt-packages-android.txt +./vcpkg install --triplet arm64-android @qt-packages-android.txt +./vcpkg install --triplet x86-android @qt-packages-android.txt +./vcpkg install --triplet x64-android @qt-packages-android.txt + +rm -rf packages buildtrees downloads + +echo "VCPKG = $vcpkg_version" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index e22425b7..cb0a24d7 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.11.3-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz" -SHA1="3d13de8020ce560159fa5cecb669498c48552d96" -appPrefix="cmake-3.11.3-Darwin-x86_64" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.15.5-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.15/cmake-3.15.5-Darwin-x86_64.tar.gz" +SHA1="a12dcf2a124ae77ddef7269e6731ab0d63ec7c64" +appPrefix="cmake-3.15.5-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" -echo "CMake = 3.11.3" >> ~/versions.txt +echo "CMake = 3.15.5" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index 35bccc93..185c3b01 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -43,23 +43,23 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=./pip.sh source "${BASH_SOURCE%/*}/pip.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" -SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.7.4-macosx10.9.pkg" +AltUrl="https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg" +SHA1="ef8a6b1abba6a6e8553916a881af440705653fa8" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" -InstallPip python3.6 +InstallPip python3.7 -/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel +/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 install virtualenv wheel -SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" -SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" +SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin" +SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin" # Install all needed packages in a special wheel cache directory -/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt +/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" -echo "python3 = 3.6.1" >> ~/versions.txt +echo "python3 = 3.7.4" >> ~/versions.txt diff --git a/coin/provisioning/common/shared/vcpkg_version.txt b/coin/provisioning/common/shared/vcpkg_version.txt new file mode 100644 index 00000000..993101eb --- /dev/null +++ b/coin/provisioning/common/shared/vcpkg_version.txt @@ -0,0 +1 @@ +vcpkg_version=qt-snapshot-2019-10-09 diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh index a9b2cfd0..9a1d9508 100755 --- a/coin/provisioning/common/unix/install_protobuff.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -53,7 +53,7 @@ sudo rm "$targetFile" # devtoolset is needed when running configuration if uname -a |grep -qv "Darwin"; then - export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH" + export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH" fi echo "Configuring and building protobuf" diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index 9d3d6aef..256d2439 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,8 +33,8 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.7" -$version = "3.7.2" +$majorminorversion = "3.15" +$version = "3.15.5" $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip") $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" @@ -44,7 +44,7 @@ Write-Host "Removing old cmake" Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue Download $officialurl $cachedurl $zip -Verify-Checksum $zip "c80c17e858ecfebfaf16fe8af18b174d2600c4e6" +Verify-Checksum $zip "3ccd9fb7ffcc0bef9bcb2c6ab105ee6a5148b7bf" Extract-7Zip $zip C: $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 new file mode 100644 index 00000000..52f1518f --- /dev/null +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -0,0 +1,69 @@ +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# +. "$PSScriptRoot\helpers.ps1" + +# This script will install vcpkg + +Write-Host "Installing vcpkg" + +$n = Get-Content "$PSScriptRoot\..\shared\vcpkg_version.txt" +$n = $n.Split('=') +New-Variable -Name $n[0] -Value $n[1] + +$officialUrl = "https://codeload.github.com/tronical/vcpkg/zip/$vcpkg_version" +$zip = "C:\Utils\vcpkg.zip" + +Download "$officialUrl" "" "$zip" +Extract-7Zip "$zip" c:\utils +Remove-Item $zip + +$installationFolder = "c:\utils\vcpkg-$vcpkg_version" + +cd $installationFolder + +cmd /c bootstrap-vcpkg.bat + +if(![System.IO.File]::Exists("$installationFolder\vcpkg.exe")){ + Write-Host "Can't find $installationFolder\vcpkg.exe. Installation probably failed!" + exit 1 +} + +Set-EnvironmentVariable VCPKG_DEFAULT_TRIPLET "qt-x64-windows-static" +Set-EnvironmentVariable VCPKG_ROOT "$installationFolder" + +cmd /c $installationFolder\vcpkg.exe install --triplet qt-x64-windows-static @qt-packages-windows.txt +cmd /c $installationFolder\vcpkg.exe install --triplet qt-x86-windows-static @qt-packages-windows.txt + +Remove-Item -Recurse -Force packages +Remove-Item -Recurse -Force buildtrees +Remove-Item -Recurse -Force downloads diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh index ebc7cac6..5d37a53a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-devtoolset.sh @@ -35,7 +35,7 @@ set -ex -sudo yum -y install devtoolset-4 +sudo yum -y install devtoolset-7 -echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc +echo "source /opt/rh/devtoolset-7/enable" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index b956d6a3..6b569552 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -38,13 +38,20 @@ set -ex # Remove update notifications and packagekit running in the background sudo yum -y remove PackageKit gnome-software +sudo yum-config-manager --enable rhel-server-rhscl-7-rpms + installPackages=() -installPackages+=(git) +installPackages+=(rh-git29) installPackages+=(zlib-devel) installPackages+=(glib2-devel) installPackages+=(openssl-devel) installPackages+=(freetype-devel) installPackages+=(fontconfig-devel) +# cmake build +installPackages+=(ninja-build) +installPackages+=(pcre2-devel) +installPackages+=(double-conversion-devel) +installPackages+=(zstd) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-devel) @@ -118,6 +125,9 @@ installPackages+=(vulkan-devel) sudo yum -y install "${installPackages[@]}" +scl enable rh-git29 bash +sudo ln -s /opt/rh/rh-git29/root/usr/bin/git /usr/local/bin/git + sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3 sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3 # We shouldn't use yum to install virtualenv. The one found from package repo is not diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh index 062b2790..062b2790 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/06-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/40-install-cmake.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh new file mode 100755 index 00000000..5c7f3f1d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/56-vcpkg.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +"$(dirname "$0")/../common/linux/vcpkg.sh" 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 index 89b1eb7f..38b4a100 100755 --- 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 @@ -169,6 +169,12 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for QtCore +installPackages+=(libdouble-conversion-dev) +installPackages+=(libpcre2-dev) +# Needed for qtgampepad +installPackages+=(libsdl2-2.0) +installPackages+=(libsdl2-dev) echo "Running update for apt" waitLoop diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh index db8a3ff5..db8a3ff5 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-cmake.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/40-install-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh index d1f3050f..9da9ed0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh @@ -2,7 +2,7 @@ set -ex -sudo zypper -nq install git gcc7 gcc7-c++ +sudo zypper -nq install git gcc7 gcc7-c++ ninja sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ --slave /usr/bin/cc cc /usr/bin/gcc-7 \ @@ -17,7 +17,8 @@ sudo zypper -nq install bison flex gperf \ fontconfig-devel \ sqlite3-devel \ libxkbcommon-devel \ - libxkbcommon-x11-devel + libxkbcommon-x11-devel \ + pcre2-devel libpng16-devel # EGL support sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh index 4f4d405e..4f4d405e 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-cmake.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-install-cmake.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh new file mode 100755 index 00000000..0faec4b4 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-freetype.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install freetype diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh new file mode 100755 index 00000000..c9d3e309 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-ninja.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install ninja diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh new file mode 100755 index 00000000..f8af516b --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-pcre2.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install pcre2 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 new file mode 100644 index 00000000..c898da22 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-vcpkg.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-vcpkg.ps1" + diff --git a/qt3d b/qt3d -Subproject c2ea752f684290d156c500c6a7174fe3f27fa08 +Subproject 299c0bc6d2ea5817ba32b3724290c349789be11 diff --git a/qtactiveqt b/qtactiveqt -Subproject 35bb7f3d233bd2016a477d3ea473c388cdd4b6a +Subproject 3832b74aca592f8edf4cc54867d0a56334e797e diff --git a/qtandroidextras b/qtandroidextras -Subproject efae79e4cc95bb8fdb3ac6f3af5366913d0060f +Subproject fe09a2dc3edb4b9a4377b25847f0c684c17fcc1 diff --git a/qtbase b/qtbase -Subproject dff3843d98d52e2c32fea07371f91117de0667e +Subproject 1c655fb0fc08e89ab5efb23889266b710334f1a diff --git a/qtcharts b/qtcharts -Subproject e948e0c9f1e9bc096ada6e1d854177f5689ce1a +Subproject 40149204fe6df6c7bcee1d215b277d4553b385f diff --git a/qtconnectivity b/qtconnectivity -Subproject 60645c1ae0ceb6bdb81e5c4ce1c7efbf215e09e +Subproject 782cbca1dcceef80a64dd1310ea854824c54665 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 78befdb83f801cb0c4d87a5b64b5554fc2bbb71 +Subproject 452cac276b493b6e9d6f1864eecaa97250cefd8 diff --git a/qtdeclarative b/qtdeclarative -Subproject 033e797aa5c58bb8f306f82292da272e60fa2fa +Subproject f500062e165975e112ea644da1d6a3d4c413be2 diff --git a/qtdoc b/qtdoc -Subproject e8db0ff104b71cc53da0a7edc50e07579115c51 +Subproject c2eb165e4cad518fa3a0660588199144477fb30 diff --git a/qtgamepad b/qtgamepad -Subproject 5fe6fd206f4aef1cb1ee9c328ee27e25e6b44f4 +Subproject 9e379c00db3d5d259f4a31a755628f69e058a4e diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 261f68697af0310abbfec2f9fee710d1a121d2d +Subproject 46f75ef4912d2a677bee4b76af1de0b7f4a37f0 diff --git a/qtimageformats b/qtimageformats -Subproject b9b0e50aa3b7ff7c4b39bdb84e6c0b8027447fb +Subproject 416cb155b16d8ab44a4a0313ab07ee6af691320 diff --git a/qtlocation b/qtlocation -Subproject 4331bee772dfbb846c0c447357b7d0f4cb43506 +Subproject c8771162fca507caaf3c1881ac26e47593608b6 diff --git a/qtlottie b/qtlottie -Subproject 27bcfc703ebbe09dc753683241fad84bd6f6a9f +Subproject 0278037c6a91a916f790971eafbc2ca0f8a9e4a diff --git a/qtmacextras b/qtmacextras -Subproject e8a235fb0eb6b14e8ce7d816535dec1c927e87e +Subproject c4353f2fbcc444aa349648e1c23e49156ae5946 diff --git a/qtmultimedia b/qtmultimedia -Subproject bb64e9df20003d705820544f55b081d22bd6287 +Subproject bb1fde2553fa05de0603df96dcd9d60cecc8548 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 8cf875f3c495bec30622526d19dd8111d7fba6c +Subproject 56e67ef8cb06071d69d75d75b131d476a65d17c diff --git a/qtpurchasing b/qtpurchasing -Subproject 29b8e7a664038b40be0fd04f839e1b382db0831 +Subproject 5b705a2b6896f8b613ad1e3120696ec0f81885e diff --git a/qtqa b/qtqa -Subproject c6412a34f038310117bdb284cbfbdbca5f19067 +Subproject 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4a diff --git a/qtquick3d b/qtquick3d -Subproject 987ef729be84ac970afb768c4a3dcc37e75fbe8 +Subproject ef675a99da6f729e36d0d2f1802de3b857db362 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject d25989845394b6a9a2c103e5c70768e57083e18 +Subproject f984a80d055e4c9bbd2224d0db54f4233838591 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 70f881e429d19948c80387912c51da53a2309b2 +Subproject 2bd4f5cd587e258227c69b3124757d7b8e019c9 diff --git a/qtquicktimeline b/qtquicktimeline -Subproject 4b1c80a322bc46836e37650afceb05f90bc345d +Subproject 5651ee826fa129f5d893ee280d83c1cf2aa7eb2 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject c603dac09f0099fd9a6482fb315e2c069a7ef5a +Subproject a959d167858aa4708b82e7b61efc9db7243c184 diff --git a/qtrepotools b/qtrepotools -Subproject 1bf0cbf1e48bb768f50e93cf112d81d423322e3 +Subproject 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d9 diff --git a/qtscript b/qtscript -Subproject 957fe147f133043cd5524323cb72da70389008d +Subproject 54176314d1c06ef387e797258cfc3993274665c diff --git a/qtscxml b/qtscxml -Subproject 103c52661f468733b64747c847308b2c45449dc +Subproject 32f10df75c789477091770ae01bb26643a66fd8 diff --git a/qtsensors b/qtsensors -Subproject 5403d0f8175f2e0d7e04fe6fafa2a7660908b5c +Subproject ae5af8baa9c0323f1908a6d218c28f9c504bc77 diff --git a/qtserialbus b/qtserialbus -Subproject a44ad0513f3a022f245d47ee513f1103fd06c2b +Subproject a3e6b5b9617d2f87e00158ae4b15e8db3e9c656 diff --git a/qtserialport b/qtserialport -Subproject f597317dbf605ecc9391825ef27f52812fea069 +Subproject 2e27d1967a9a4146697028ed8feed14d0df2a46 diff --git a/qtspeech b/qtspeech -Subproject 25c1b5b74cc96ceaefeed6be76cda402f406a23 +Subproject 0b7c9acbafbfe32f6ccb254b7ec656fac6fb189 diff --git a/qtsvg b/qtsvg -Subproject 2960c9d0d9feaae5fb8b2fc04da267b43d23826 +Subproject 98a62da5b2dd622dd896b43c6b8a58eec0332b3 diff --git a/qttools b/qttools -Subproject a3e97fb5c0d87187d16cbb21ec2254ab2f45550 +Subproject f46489d856c347d38fac502f75370c87c83b8ce diff --git a/qttranslations b/qttranslations -Subproject a69268af181c412e21de88efd1d903de4457e19 +Subproject 66952c79bc648e1074936dddb7fa2cffc17b177 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 50f1b28991b7c8207d6b999478d88ffb528ff79 +Subproject 3744d0c3c961049a84023b7f8567e48196475b2 diff --git a/qtwayland b/qtwayland -Subproject bf014dc5ab94bdd40ad7d07e18133181b0c636e +Subproject c9970025bc912c6d3b2fe6183762c6f254e84ae diff --git a/qtwebchannel b/qtwebchannel -Subproject e1c7e036431aa0da365dbdd8be7ce723cd72c7d +Subproject 8b701450aeceb878784879eaf65dc42d5befd3a diff --git a/qtwebengine b/qtwebengine -Subproject cda76002257d56ffedbf8d28211cfd66a7226e7 +Subproject bbd11d8da5c52c5c76a6657d884d2e648e41010 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 531fb30d539f09003946ab768873ef87e6117fa +Subproject bd97e6e554c21144cadc9e047fa7d5f22f5f32b diff --git a/qtwebsockets b/qtwebsockets -Subproject 9f824f8fd08642c5099c9a032628314858ce7fe +Subproject 539d5597491893c939c7a05ff4d45261e949e9c diff --git a/qtwebview b/qtwebview -Subproject dfbe1343cd7d34a5fa3c9854568cc28e265df15 +Subproject f8c190945d7b3679db5a322de8e49acc88748c7 diff --git a/qtwinextras b/qtwinextras -Subproject 18cf8f3120ab8b5522b1fe0846c3f1659bfc33f +Subproject 816942521342e9a8c4c279fb6c759e65c8ff56b diff --git a/qtx11extras b/qtx11extras -Subproject 76e206e0a30d2c6532b9b5c6cf98d83d7b97d66 +Subproject f73456e18e0fbe959e623c94bd1ebb23769f7e3 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 05ab44484453673ee813bcac287fc9052ec9164 +Subproject bc4290cde83470dd72eb49e8cf6275f7b7a70f3 |