diff options
122 files changed, 406 insertions, 779 deletions
diff --git a/.gitmodules b/.gitmodules index 7657f30f..2f6addc7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.13 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.13 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.13 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.13 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.13 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 - status = addon + branch = 5.13 + status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.13 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.13 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,192 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtserialbus"] - depends = qtserialport + depends = qtbase + recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.13 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 - status = addon + branch = dev + status = ignore [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.13 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.13 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.13 status = addon +[submodule "qtlottie"] + depends = qtbase qtdeclarative + path = qtlottie + url = ../qtlottie.git + branch = 5.13 + status = preview diff --git a/_clang-format b/_clang-format index c64ae331..589baff3 100644 --- a/_clang-format +++ b/_clang-format @@ -42,7 +42,7 @@ BraceWrapping: AfterFunction: true AfterNamespace: false AfterObjCDeclaration: false - AfterStruct: false + AfterStruct: true AfterUnion: false BeforeCatch: false BeforeElse: false diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 3959e24a..29a20a07 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,18 +1,17 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle +qtci-windows-10-x86_64-14 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples +qtci-windows-10-x86_64-14 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests +qtci-linux-openSUSE-15.0-x86_64 GCC DeveloperBuild NoPch +qtci-linux-openSUSE-15.0-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC Packaging Release NoPch DisableTests qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch @@ -23,6 +22,7 @@ qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release +qtci-linux-Ubuntu-18.04-x86_64 QEMU mips64 GCC Release DisableTests qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 3de18a74..1001d869 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,22 +1,21 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index ce289290..1001d869 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,21 +1,21 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-14 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-14 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index aaac89d0..e8e10354 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -2,6 +2,5 @@ Template Target OS Target arch Compiler Fe --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo -qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests - +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +qtci-linux-openSUSE-15.0-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests diff --git a/coin/platform_configs/qtconnectivity.txt b/coin/platform_configs/qtconnectivity.txt index 4ac73c86..15f11bd1 100644 --- a/coin/platform_configs/qtconnectivity.txt +++ b/coin/platform_configs/qtconnectivity.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +qtci-windows-10-x86_64-14 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index a357ad5b..27782f88 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-14 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 index 0c00ba71..2bb92c22 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 index 2ad479c8..35f8dc3f 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2015_update.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 index cf00ee88..052ec9c6 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 index e7f4c248..e7f4c248 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-enable-dotnet-framework.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/01-enable-dotnet-framework.ps1 diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 index 2ad479c8..00f8af72 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -30,29 +30,22 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1" -# Install Visual Studio $version with $update_version -# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs -$version = "2015" -$update_version = "3" +# Visual Studio $version was installed manually using $installer. +$version = "2015 update 3" +$version_number ="14.0.25431.01" +$installer = "http://ci-files01-hki.intra.qt.io/input/windows/en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978" -# Only way to install specific Visual studio release is to use feed.xml. -# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx' -# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates) -$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml" +# default plus following components were selected: +# * Visual C++ +# * Universal Windows App Development Tools +# - Tools (1.4.1) and Windows SDK (10.0.14393) +# - Windows 10 SDK (10.0.10586) +# - Windows 10 SDK (10.0.10240) +# * Common Tools +# -Visual Studio Extensibility Tools Update 3 -$msvc_web_installer = "vs" + $version + "_" + $update_version -$package = "C:\Windows\temp\$msvc_web_installer.exe" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe" -$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129" -$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266" +# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer +$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe" -echo "Fetching Visual Studio $version update $update_version..." -Download $url_official $url_cache $package -Verify-Checksum $package $sha1 -echo "Installing Visual studio $version update $update_version..." -cmd /c "$package $parameters /norestart /Quiet" -remove-item $package - -echo "Visual Studio = $version update $update_version" >> ~\versions.txt +echo "Visual Studio = $version version $version_number" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index cf00ee88..cc0dbd85 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -31,19 +31,57 @@ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 +# Visual Studio $version version $version_number was installed manually using $installer. $version = "2017" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe" -$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae" -$msvcPackage = "C:\Windows\Temp\$version.exe" +$version_number = "15.8.5" +$installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__1312218103.1526017942.exe" +# Following components were selected from installer: +# Microsoft.Net.Component.4.5.TargetingPack (.NET Framework 4.5 targeting pack) +# Microsoft.Net.Component.4.6.1.SDK (.NET Framework 4.6.1 SDK) +# Microsoft.Component.NetFX.Native (.NET Native) +# Microsoft.VisualStudio.Component.PortableLibrary (.NET Portable Library targeting pack) +# Microsoft.VisualStudio.Component.SQL.CLR (CLR data types for SQL Server) +# Microsoft.VisualStudio.Component.VisualStudioData (Data sources and service references) +# Microsoft.Component.ClickOnce (ClickOnce Publishing) +# Microsoft.VisualStudio.Component.AppInsights.Tools (Developer Analytics tools) +# Microsoft.VisualStudio.Component.NuGet (NuGet package manager) +# Microsoft.VisualStudio.Component.Static.Analysis.Tools (Static analysis tools) +# Microsoft.VisualStudio.Component.TextTemplating (Text Template Transformation) +# Microsoft.VisualStudio.Component.Roslyn.Compiler (C# and Visual Basic Roslyn compilers) +# Microsoft.Component.MSBuild (MSBuild) +# Microsoft.VisualStudio.Component.VC.Tools.x86.x64 (VC++ 2017 version 15.8 v14.15 latest v141 tools) +# Microsoft.VisualStudio.Component.VC.Redist.14.Latest (Visual C++ 2017 Redistributable Update) +# Microsoft.VisualStudio.Component.VC.Tools.ARM (Visual C++ compilers and libraries for ARM) +# Microsoft.VisualStudio.Component.VC.Tools.ARM64 (Visual C++ compilers and libraries for ARM64) +# Microsoft.VisualStudio.Component.VC.CMake.Project (Visual C++ tools for CMake) +# Microsoft.VisualStudio.Component.DiagnosticTools (.NET profiling tools) +# Microsoft.VisualStudio.Component.VC.DiagnosticTools (C++ profiling tools) +# Microsoft.VisualStudio.Component.JavaScript.Diagnostics (JavaScript diagnostics) +# Microsoft.VisualStudio.Component.Debugger.JustInTime (Just-In-Time debugger) +# Microsoft.VisualStudio.Component.Roslyn.LanguageServices (C# and Visual Basic) +# Microsoft.VisualStudio.Component.JavaScript.TypeScript (JavaScript and TypeScript language support) +# Component.Microsoft.VisualStudio.RazorExtension (Razor Language Services) +# Component.Linux.CMake (Visual C++ tools for CMake and Linux) +# Microsoft.VisualStudio.Component.VC.CoreIde (Visual Studio C++ core features) +# Microsoft.VisualStudio.Component.Graphics.Tools (Graphics debugger and GPU profiler for DirectX) +# Microsoft.VisualStudio.Component.Graphics (Image and 3D model editors) +# Microsoft.VisualStudio.Component.Graphics.Win81 (Graphics Tools Windows 8.1 SDK) +# Microsoft.VisualStudio.Component.TypeScript.2.3 (TypeScript 2.3 SDK) +# Microsoft.VisualStudio.Component.TypeScript.3.0 (TypeScript 3.0 SDK) +# Microsoft.VisualStudio.Component.VC.ATL (Visual C++ ATL for x86 and x64) +# Microsoft.VisualStudio.Component.Windows10SDK.10240 (Windows 10 SDK (10.0.10240.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.10586 (Windows 10 SDK (10.0.10586.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.14393 (Windows 10 SDK (10.0.14393.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.Desktop (Windows 10 SDK (10.0.15063.0) for Desktop C++ [x86 and x64]) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP (Windows 10 SDK (10.0.15063.0) for UWP: C#, VB, JS) +# Microsoft.VisualStudio.Component.Windows10SDK.15063.UWP.Native (Windows 10 SDK (10.0.15063.0) for UWP: C++) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop (Windows 10 SDK (10.0.16299.0) for Desktop C++ [x86 and x64]) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP (Windows 10 SDK (10.0.16299.0) for UWP: C#, VB, JS) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.UWP.Native (Windows 10 SDK (10.0.16299.0) for UWP: C++) +# Microsoft.VisualStudio.Component.Windows10SDK.16299.Desktop.arm (Windows 10 SDK (10.0.16299.0) for Desktop C++ [ARM and ARM64]) +# Microsoft.VisualStudio.Component.Windows10SDK.17134 (Windows 10 SDK (10.0.17134.0)) +# Microsoft.VisualStudio.Component.Windows10SDK.17763 (Windows 10 SDK (10.0.17763.0)) -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio = $version" >> ~\versions.txt +echo "Visual Studio = $version version version_number" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 index bfbb397a..bfbb397a 100644 --- a/coin/provisioning/common/windows/msvc_2015_update3_patch.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index c77af943..5840d4b4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -51,13 +51,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android" toolsVersion="r26.1.1" toolsFile="sdk-tools-linux-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-28" toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" -ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" +ndkSha1="fd94d0be6017c6acbd193eb95e09cf4b6f61b834" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" @@ -95,6 +95,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index b73e44a5..06d17be0 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -39,6 +39,8 @@ echo "Disable Network Time Protocol (NTP)" if uname -a |grep -q "Ubuntu"; then sudo timedatectl set-ntp false +elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then + (sudo systemctl stop chronyd && sudo systemctl disable chronyd) else (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh index 16af0a0a..1d9e8419 100755 --- a/coin/provisioning/common/linux/docker.sh +++ b/coin/provisioning/common/linux/docker.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -48,5 +48,8 @@ sudo docker info sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose sudo chmod +x /usr/local/bin/docker-compose +# Install Avahi to discover Docker containers in the test network +sudo apt-get install avahi-daemon -y + # Start testserver provisioning -source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh" +source "${BASH_SOURCE%/*}/docker_testserver.sh" diff --git a/coin/provisioning/common/linux/testserver/docker_testserver.sh b/coin/provisioning/common/linux/docker_testserver.sh index 2534c416..2d5d9611 100755 --- a/coin/provisioning/common/linux/testserver/docker_testserver.sh +++ b/coin/provisioning/common/linux/docker_testserver.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -35,35 +35,28 @@ set -ex +case ${BASH_SOURCE[0]} in + */linux/*) SERVER_PATH="${BASH_SOURCE[0]%/linux/*}/shared/testserver" ;; + */*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;; + *) SERVER_PATH="../shared/testserver" ;; +esac + +# testserver shared scripts +source "$SERVER_PATH/testserver_util.sh" + # Using SHA-1 of each server context as the tag of docker images. A tag labels a # specific image version. It is used by docker compose file (docker-compose.yml) # to launch the corresponding docker containers. If one of the server contexts # (./apache2, ./danted, ...) gets changes, all the related compose files in # qtbase should be updated as well. -# -# For example, here's how to get the SHA-1 of apache test server. -# find ./apache2 -type f -print0 | sort -z | xargs -r0 sha1sum | \ -# awk '{ print $1 }' | sha1sum | awk '{ print $1 }' -testserver='apache2 squid vsftpd ftp-proxy danted' +source "$SERVER_PATH/settings.sh" for server in $testserver do - context="${BASH_SOURCE%/*}/$server" - sha1=$(find $context -type f -print0 | sort -z | xargs -r0 sha1sum | awk '{ print $1 }' | \ - sha1sum | awk '{ print $1 }') - sudo docker build -t qt-test-server-$server:$sha1 $context - - # transition - The fixed tag is temporarily used by CI to pass the qtbase testing. - case $server in - apache2) fixed_tag="cc9ea678b92bdda33acb9fa0159bb4ad0f3cd947" ;; - squid) fixed_tag="577d99307eea9a8cccfec944d25be2bce2fe99cc" ;; - vsftpd) fixed_tag="18896604c7e90b543e56d80c8a8aabdb65a590d0" ;; - ftp-proxy) fixed_tag="2c6c8f1ab6a364b540c43d705fb6f15a585cb2af" ;; - danted) fixed_tag="327dd56c3c35db85b26fac93213a5a1918475bc7" ;; - esac - [ -z "$fixed_tag" ] || \ - sudo docker tag qt-test-server-$server:$sha1 qt-test-server-$server:$fixed_tag + context="$SERVER_PATH/$server" + # Sort files by their SHA-1 and use the accumulated result as the TAG + sudo docker build -t qt-test-server-$server:$(sha1tree $context) $context done sudo docker images diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 55f5a8c9..7ccfe0a5 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.16" +version="1.38.27" version_node="8.9.1" urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" -sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d" -sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673" +sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161" +sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh index f4016f8d..4ab914de 100755 --- a/coin/provisioning/common/macos/python2.sh +++ b/coin/provisioning/common/macos/python2.sh @@ -42,9 +42,9 @@ 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-2.7.14-macosx10.6.pkg" -AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" -SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.16-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.16/python-2.7.16-macosx10.6.pkg" +SHA1="895a8327a58e7c0e58852638ab3d84843643535b" DestDir="/" InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" @@ -55,5 +55,5 @@ InstallPip python2.7 SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" -echo "python2 = 2.7.14" >> ~/versions.txt +echo "python2 = 2.7.16" >> ~/versions.txt diff --git a/coin/provisioning/common/linux/testserver/apache2/Dockerfile b/coin/provisioning/common/shared/testserver/apache2/Dockerfile index b39eb21e..b39eb21e 100644 --- a/coin/provisioning/common/linux/testserver/apache2/Dockerfile +++ b/coin/provisioning/common/shared/testserver/apache2/Dockerfile diff --git a/coin/provisioning/common/linux/testserver/danted/Dockerfile b/coin/provisioning/common/shared/testserver/danted/Dockerfile index 67c1159b..67c1159b 100644 --- a/coin/provisioning/common/linux/testserver/danted/Dockerfile +++ b/coin/provisioning/common/shared/testserver/danted/Dockerfile diff --git a/coin/provisioning/common/linux/testserver/danted/danted b/coin/provisioning/common/shared/testserver/danted/danted index 1da8203e..1da8203e 100755 --- a/coin/provisioning/common/linux/testserver/danted/danted +++ b/coin/provisioning/common/shared/testserver/danted/danted diff --git a/coin/provisioning/common/linux/testserver/danted/danted-authenticating b/coin/provisioning/common/shared/testserver/danted/danted-authenticating index 7aa35db6..7aa35db6 100755 --- a/coin/provisioning/common/linux/testserver/danted/danted-authenticating +++ b/coin/provisioning/common/shared/testserver/danted/danted-authenticating diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/common/shared/testserver/docker_machine.sh index 96b197ea..601056a4 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/common/shared/testserver/docker_machine.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -35,5 +35,16 @@ set -ex -# shellcheck source=../common/unix/mqtt_broker.sh -source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" +TestMachine='qt-test-server' + +# Deploy docker virtual machine (Boot2Docker) into VirtualBox only if it doesn't exist +if [ -z $(docker-machine ls -q --filter "name=$TestMachine") ] +then + docker-machine create -d virtualbox $TestMachine + docker-machine ip $TestMachine +fi + +# Switch the docker engine to $TestMachine +eval $(docker-machine env $TestMachine) + +docker-machine ls diff --git a/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile b/coin/provisioning/common/shared/testserver/ftp-proxy/Dockerfile index c719c1eb..c719c1eb 100644 --- a/coin/provisioning/common/linux/testserver/ftp-proxy/Dockerfile +++ b/coin/provisioning/common/shared/testserver/ftp-proxy/Dockerfile diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/common/shared/testserver/settings.sh index 4034162e..041661f2 100755..100644 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/common/shared/testserver/settings.sh @@ -1,5 +1,3 @@ -#!/bin/env bash - ############################################################################# ## ## Copyright (C) 2018 The Qt Company Ltd. @@ -35,5 +33,5 @@ set -ex -# shellcheck source=../common/linux/qnx_660.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" +# A list of test servers to be provisioned +testserver='apache2 squid vsftpd ftp-proxy danted' diff --git a/coin/provisioning/common/linux/testserver/squid/Dockerfile b/coin/provisioning/common/shared/testserver/squid/Dockerfile index f0ed68b3..f0ed68b3 100644 --- a/coin/provisioning/common/linux/testserver/squid/Dockerfile +++ b/coin/provisioning/common/shared/testserver/squid/Dockerfile diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh b/coin/provisioning/common/shared/testserver/testserver_util.sh index a2d162d3..c42fb5e0 100755..100644 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/common/shared/testserver/testserver_util.sh @@ -1,8 +1,6 @@ -#!/bin/env bash - ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -35,5 +33,9 @@ set -ex -# shellcheck source=../common/linux/qnx_700.sh -source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh" +# Sort files by their SHA-1, and then return the accumulated result +sha1tree () { + find "$@" -type f -print0 | \ + xargs -0 shasum | cut -d ' ' -f 1 | \ + sort | shasum | cut -d ' ' -f 1 +} diff --git a/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile b/coin/provisioning/common/shared/testserver/vsftpd/Dockerfile index af6cd7c7..af6cd7c7 100644 --- a/coin/provisioning/common/linux/testserver/vsftpd/Dockerfile +++ b/coin/provisioning/common/shared/testserver/vsftpd/Dockerfile diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 1b4dd35d..def09116 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -40,10 +40,10 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r18b" -$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" -$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803" +$ndkVersion = "r19c" +$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip" +$ndkChecksum = "c4cd8c0b6e7618ca0a871a5f24102e40c239f6a3" $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" @@ -98,7 +98,7 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 cd $toolsFolder\bin\ $sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion" $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args' -iex $command +Invoke-Expression $command $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' iex $command cmd /c "dir C:\Utils\android" diff --git a/coin/provisioning/common/windows/disable-defragment.ps1 b/coin/provisioning/common/windows/disable-defragment.ps1 index 876938f8..e76f0649 100644 --- a/coin/provisioning/common/windows/disable-defragment.ps1 +++ b/coin/provisioning/common/windows/disable-defragment.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2018 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. @@ -31,4 +31,42 @@ ## ############################################################################# -schtasks /Delete /TN "\Microsoft\Windows\Defrag\ScheduledDefrag" /F +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 0c00ba71..0c4a9680 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1 +++ b/coin/provisioning/common/windows/install-msys2.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. @@ -30,19 +30,41 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\helpers.ps1" - -# This script will install Visual Studio 2017 Build Tools -# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017 - -$version = "2017_version_15.0" -$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe" -$sha1 = "a31e099e5114fef80a21654689e6864afc544a16" -$msvcPackage = "C:\Windows\Temp\$version.exe" - -Download $url_cache $url_cache $msvcPackage -Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --passive --wait" -echo "Cleaning $msvcPackage.." -Remove-Item -Recurse -Force "$msvcPackage" -echo "Visual Studio Build Tools = $version" >> ~\versions.txt + +. "$PSScriptRoot\helpers.ps1" + +# This script installs 7-Zip + +$version = "20181211" +$prog = "msys2" +if (Is64BitWinHost) { + $arch = "x86_64" + $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2" + $folder = "msys64" +} else { + $arch = "i686" + $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e" + $folder = "msys32" +} +$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz" + + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" +$url_official = "http://repo.msys2.org/distrib/$arch/$package" +$PackagePath = "C:\Windows\Temp\$package" +$TargetLocation = "C:\Utils" + + +Download $url_official $url_cache $PackagePath +Verify-Checksum $PackagePath $sha1 +Extract-tar_gz $PackagePath $TargetLocation +$msys = "$TargetLocation\$folder\msys2_shell.cmd" + +# install perl +Run-Executable "$msys" "`"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" +Run-Executable "$msys" "`"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" + +Write-Host "Cleaning $PackagePath.." +Remove-Item -Recurse -Force -Path "$PackagePath" + +Write-Output "7-Zip = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1 index 29ce0ab4..8ed91402 100644 --- a/coin/provisioning/common/windows/mysql.ps1 +++ b/coin/provisioning/common/windows/mysql.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. @@ -36,7 +36,7 @@ # This script installs MySQL $version. # Both x86 and x64 versions needed when x86 integrations are done on x64 machine -$version = "5.6.11" +$version = "5.7.25" $baseNameX64 = "mysql-$version-winx64" $packagex64 = "C:\Windows\temp\$baseNameX64.zip" $baseNameX86 = "mysql-$version-win32" diff --git a/coin/provisioning/common/windows/unset-proxy.ps1 b/coin/provisioning/common/windows/unset-proxy.ps1 index 9c3dddb3..0b7d761f 100644 --- a/coin/provisioning/common/windows/unset-proxy.ps1 +++ b/coin/provisioning/common/windows/unset-proxy.ps1 @@ -38,6 +38,11 @@ $dcs = (Get-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\ $dcs[8] = $_ -band 0xF7 Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings\Connections" -Name DefaultConnectionSettings -Value $dcs Set-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyEnable -Value 0 -Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer -Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride +if(Get-ItemProperty -ErrorAction SilentlyContinue -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer){ + Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyServer + +} +if(Get-ItemProperty -ErrorAction SilentlyContinue -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride){ + Remove-ItemProperty -Path "HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings" -Name ProxyOverride +} diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh deleted file mode 100755 index 8590d4e4..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-cracklib.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh deleted file mode 100755 index f12cff1e..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -# shellcheck source=../common/linux/disable-mlocate.sh -"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager deleted file mode 100755 index 12302976..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/remove_update-manager.sh -source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-systemsetup.sh deleted file mode 100755 index ee6af148..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-systemsetup.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script modifies system settings for automated use - -set -ex - -# shellcheck source=../common/unix/check_and_set_proxy.sh -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" - -NTS_IP=10.212.2.216 - -echo "Set timezone to UTC." -sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable questions on shutdown." -gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true - -echo "Set Network Test Server address to $NTS_IP in /etc/hosts" -echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts - -if [ "$proxy" != "" ]; then - echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf -fi diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh deleted file mode 100755 index bfbb6a8e..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/02-apt.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# Install required packages with APT - -set -ex - -echo "Disabling auto update" -sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic -for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do - sudo systemctl stop $service - sudo systemctl disable $service -done - -installPackages+=(git) -installPackages+=(p7zip-full) -installPackages+=(expect) - -echo "Running update for apt" -sudo apt-get update -echo "Installing packages" -sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/90-squish.sh deleted file mode 100755 index 965112af..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/90-squish.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh deleted file mode 100755 index 8590d4e4..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-cracklib.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh deleted file mode 100755 index f12cff1e..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -# shellcheck source=../common/linux/disable-mlocate.sh -"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager deleted file mode 100755 index 12302976..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/remove_update-manager.sh -source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh deleted file mode 100755 index b917d292..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# This script modifies system settings for automated use - -set -ex - -# shellcheck source=../common/unix/check_and_set_proxy.sh -source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" - -NTS_IP=10.212.2.216 - -echo "Set timezone to UTC." -sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable questions on shutdown." -gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true -echo "Set grub timeout to 0" -sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub -sudo update-grub - -echo "Set Network Test Server address to $NTS_IP in /etc/hosts" -echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts - -if [ "$http_proxy" != "" ]; then - echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf -fi - -# This won't be needed for Ubuntu 17 and above, see QTBUG-67757. -sudo sed -i '/-UnityDecoration-extents/c\ -UnityDecoration-extents: 0 0 0 0;' /usr/share/themes/Ambiance/gtk-3.0/apps/unity.css diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh deleted file mode 100755 index f2eb6e60..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -# Install required packages with APT - -set -ex - -echo "Disabling auto update" -sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic -for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do - sudo systemctl stop $service - sudo systemctl disable $service -done - -# aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) -for i in $(seq 10); do - echo attempting to remove aptdaemon - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true - # check that aptdaemon is no longer installed - which aptd > /dev/null || break - if [[ $i -eq 10 ]]; then - exit 1 - fi - sleep 10 -done - -# Git is not needed by builds themselves, but is nice to have -# immediately as one starts debugging -installPackages+=(git) -# 7zip is a needed decompressing tool -installPackages+=(p7zip-full) -# To be able to mount yocto-cache during builds -installPackages+=(nfs-common) -# libssl-dev provides headers for OpenSSL -installPackages+=(libssl-dev) -# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git -installPackages+=("^libxcb.*") -installPackages+=(libxkbcommon-dev) -installPackages+=(libxkbcommon-x11-dev) -installPackages+=(libx11-xcb-dev) -installPackages+=(libglu1-mesa-dev) -installPackages+=(libxrender-dev) -installPackages+=(libxi-dev) -# Enable linking to system dbus -installPackages+=(libdbus-1-dev) -# Needed libraries for WebEngine -installPackages+=(libudev-dev) -installPackages+=(libegl1-mesa-dev) -installPackages+=(libfontconfig1-dev) -installPackages+=(libxss-dev) -# Common event loop handling -installPackages+=(libglib2.0-dev) -# MySQL support -installPackages+=(libmysqlclient-dev) -# PostgreSQL support -installPackages+=(libpq-dev) -# SQLite support -installPackages+=(libsqlite3-dev) -# ODBC support -installPackages+=(unixodbc-dev) -# Support for FreeType font engine -installPackages+=(libfreetype6-dev) -# Enable the usage of system jpeg libraries -installPackages+=(libjpeg-dev) -# Enable support for printer driver -installPackages+=(libcups2-dev) -# Install libraries needed for QtMultimedia to be able to support all plugins -installPackages+=(libasound2-dev) -installPackages+=(libgstreamer1.0-dev) -installPackages+=(libgstreamer-plugins-base1.0-dev) -installPackages+=(libgstreamer-plugins-good1.0-dev) -installPackages+=(libgstreamer-plugins-bad1.0-dev) -# Support for cross-building to x86 (needed by WebEngine boot2qt builds) -installPackages+=(g++-multilib) -# python2 development package -installPackages+=(python-pip) -# python3 development package -installPackages+=(python3-dev) -installPackages+=(python3-pip) -installPackages+=(python3-virtualenv) -installPackages+=(python3-wheel) -# Needed to be able to build Yocto -installPackages+=(chrpath) -installPackages+=(gawk) -installPackages+=(texinfo) -# Automates interactive applications (Needed by RTA to automate configure testing) -installPackages+=(expect) -installPackages+=(mesa-common-dev) -installPackages+=(libgl1-mesa-glx) -installPackages+=(libgl1-mesa-dev) -installPackages+=(libegl1-mesa-dev) -installPackages+=(curl) -installPackages+=(libicu-dev) -installPackages+=(zlib1g-dev) -installPackages+=(zlib1g) -installPackages+=(zlib1g:i386) -installPackages+=(openjdk-8-jdk) -installPackages+=(libgtk-3-dev) -installPackages+=(ninja-build) -installPackages+=(libssl-dev) -installPackages+=(libxcursor-dev) -installPackages+=(libxcomposite-dev) -installPackages+=(libxdamage-dev) -installPackages+=(libxrandr-dev) -installPackages+=(libfontconfig1-dev) -installPackages+=(libxss-dev) -installPackages+=(libsrtp0-dev) -installPackages+=(libwebp-dev) -installPackages+=(libjsoncpp-dev) -installPackages+=(libopus-dev) -installPackages+=(libminizip-dev) -installPackages+=(libavutil-dev) -installPackages+=(libavformat-dev) -installPackages+=(libavcodec-dev) -installPackages+=(libevent-dev) -installPackages+=(bison) -installPackages+=(flex) -installPackages+=(gperf) -installPackages+=(libasound2-dev) -installPackages+=(libpulse-dev) -installPackages+=(libxtst-dev) -installPackages+=(libnspr4-dev) -installPackages+=(libnss3-dev) -installPackages+=(libopenal-dev) -installPackages+=(libbluetooth-dev) -#VirtualBox for RTA -installPackages+=(virtualbox) -installPackages+=(dkms) -#Pypdf for QSR documentation -installPackages+=(python-pypdf2) - -sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe -deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-updates main restricted universe multiverse -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-backports main restricted universe -deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu.trumpetti.atm.tut.fi/ubuntu/ xenial-security main restricted universe multiverse -EOC - -echo "Running update for apt" -sudo apt-get update -echo "Installing packages" -sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" - -# Install all needed packages in a special wheel cache directory -pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" - -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh deleted file mode 100755 index 89806892..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash - -# shellcheck source=../common/linux/disable-ntp_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh deleted file mode 100755 index 331a14d9..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-libclang.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh deleted file mode 100755 index d8df4375..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh deleted file mode 100755 index 74dd1579..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -# shellcheck source=../common/unix/install-breakpad.sh -source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh deleted file mode 100755 index 0527fe85..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# shellcheck source=../common/linux/android_linux.sh -source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh deleted file mode 100755 index db8a3ff5..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/cmake_linux.sh" - diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh deleted file mode 100755 index 82c2c659..00000000 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/linux/docker.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 dae1a58e..949de904 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 @@ -97,6 +97,8 @@ installPackages+=(libfreetype6-dev) installPackages+=(libjpeg-dev) # Enable support for printer driver installPackages+=(libcups2-dev) +# Enable support for printer test +installPackages+=(cups-pdf) # Install libraries needed for QtMultimedia to be able to support all plugins installPackages+=(libasound2-dev) installPackages+=(libgstreamer1.0-dev) @@ -159,6 +161,11 @@ installPackages+=(dkms) installPackages+=(libspeechd-dev) #Pypdf for PDF reading in RTA tests installPackages+=(python-pypdf2) +# Needed for b2qt +installPackages+=(git-lfs) +installPackages+=(chrpath) +installPackages+=(gawk) +installPackages+=(texinfo) echo "Running update for apt" waitLoop diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh index 7f5140fd..7f5140fd 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-git_lfs.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-git_lfs.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index 1c856c0c..df0a10ae 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -echo "Installing Yocto toolchain for 32-bit b2qt..." +echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..." -versionARM="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="db7a0f4f9ddd5992a563d5348889021a7ceb1c56" +versionARM="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="a03b4eb492b16c6e60cf83c0718c27e9cfa6d522" yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" yoctoLocationARMv7="/opt/yocto-armv7" sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" @@ -60,13 +60,13 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7" rm -rf "$yoctoInstaller" -echo "Installing Yocto toolchain for 64-bit b2qt..." +echo "Installing Yocto toolchain for 64-bit b2qt ARM64..." -versionARM64="2.3.4" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-7608ebe.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" -SHA1="5dcae7c6cbc266798ba49a9e51fff1f06790729d" +versionARM64="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="3dadf1135d00f7cb5586b605b1f7344ae828c9cd" yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" yoctoLocationARM64="/opt/yocto-arm64" sysrootARM64="sysroots/aarch64-poky-linux" @@ -78,11 +78,33 @@ chmod +x "$yoctoInstaller" /bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" rm -rf "$yoctoInstaller" -if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then +echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..." + +versionMIPS64="2.5.2" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-409ebc3.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" +SHA1="dd03b496707ca8888b339a667e021722a8c2fdb4" +yoctoInstaller="/tmp/yocto-toolchain-mips64.sh" +yoctoLocationMIPS64="/opt/yocto-mips64" +sysrootMIPS64="sysroots/mips64-poky-linux" +crosscompileMIPS64="sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationMIPS64" +rm -rf "$yoctoInstaller" + + + +if [ -e "$yoctoLocationARMv7/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && [ -e "$yoctoLocationARM64/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ] && [ -e "$yoctoLocationMIPS64/$sysrootMIPS64" ] && [ -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ]; then SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" SetEnvVar "QEMUARM64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARM64/$crosscompileARM64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_SYSROOT" "$yoctoLocationMIPS64/$sysrootMIPS64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationMIPS64/$crosscompileMIPS64" else echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 exit 1 @@ -90,3 +112,4 @@ fi echo "Yocto ARMv7 toolchain = $versionARM" >> ~/versions.txt echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt +echo "Yocto MIPS64 toolchain = $versionMIPS64" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh index 61c19510..7e6993a5 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/01-systemsetup.sh @@ -8,6 +8,9 @@ source "$BASEDIR/../common/shared/network_test_server_ip.txt" # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" +# https://bugzilla.opensuse.org/show_bug.cgi?id=1032027 +sudo btrfs quota disable / + sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub @@ -33,4 +36,3 @@ if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy fi - diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.sh index 38707a8a..38707a8a 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-disable-ntp.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-disable-ntp.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 new file mode 100755 index 00000000..d1f3050f --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/02-zypperpackages.sh @@ -0,0 +1,51 @@ +#!/usr/bin/env bash + +set -ex + +sudo zypper -nq install git gcc7 gcc7-c++ +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 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-7 + +sudo zypper -nq install bison flex gperf \ + zlib-devel \ + libudev-devel \ + glib2-devel \ + libopenssl-devel \ + freetype2-devel \ + fontconfig-devel \ + sqlite3-devel \ + libxkbcommon-devel \ + libxkbcommon-x11-devel + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel + + +# Xinput2 +sudo zypper -nq install libXi-devel + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ + xcb-util-wm-devel xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel libicu60_2 + +# qtwebengine +sudo zypper -nq install alsa-devel dbus-1-devel \ + libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ + mozilla-nspr-devel mozilla-nss-devel + +# qtwebkit +sudo zypper -nq install libxml2-devel libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel + +# cups +sudo zypper -nq install cups-devel + +#speech-dispatcher +sudo zypper -nq install libspeechd-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh index bbe2b4b4..bbe2b4b4 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-libclang.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh index 6c5d2a0f..6c5d2a0f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/08-pythondev.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh index 5eb53566..5eb53566 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh index 7ab8528a..7ab8528a 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh index e677427f..e677427f 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh index 09a76778..09a76778 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/55-emsdk.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh index e4281588..e4281588 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh index 5ff78055..5ff78055 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-version.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh index 03565da2..03565da2 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh deleted file mode 100755 index 2fab85ac..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/usr/bin/env bash - -set -ex - -sudo zypper -nq install git -sudo zypper -nq install gcc7 -sudo zypper -nq install gcc7-c++ -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 \ - --slave /usr/bin/c++ c++ /usr/bin/g++-7 - -sudo zypper -nq install bison -sudo zypper -nq install flex -sudo zypper -nq install gperf - -sudo zypper -nq install zlib-devel -sudo zypper -nq install libudev-devel -sudo zypper -nq install glib2-devel -sudo zypper -nq install libopenssl-devel -sudo zypper -nq install freetype2-devel -sudo zypper -nq install fontconfig-devel -sudo zypper -nq install sqlite3-devel - -# EGL support -sudo zypper -nq install Mesa-libEGL-devel -sudo zypper -nq install Mesa-libGL-devel - -# libxkbcommon -sudo zypper -nq install libxkbcommon-devel -sudo zypper -nq install libxkbcommon-x11-devel - -# Xinput2 -sudo zypper -nq install libXi-devel - -# system provided XCB libraries -sudo zypper -nq install xcb-util-devel -sudo zypper -nq install xcb-util-image-devel -sudo zypper -nq install xcb-util-keysyms-devel -sudo zypper -nq install xcb-util-wm-devel -sudo zypper -nq install xcb-util-renderutil-devel - -# ICU -sudo zypper -nq install libicu-devel -sudo zypper -nq install libicu52_1 - -# qtwebengine -sudo zypper -nq install alsa-devel -sudo zypper -nq install dbus-1-devel -sudo zypper -nq install libXcomposite-devel -sudo zypper -nq install libXcursor-devel -sudo zypper -nq install libXrandr-devel -sudo zypper -nq install libXtst-devel -sudo zypper -nq install mozilla-nspr-devel -sudo zypper -nq install mozilla-nss-devel - -# qtwebkit -sudo zypper -nq install libxml2-devel -sudo zypper -nq install libxslt-devel - -# GStreamer (qtwebkit and qtmultimedia) -sudo zypper -nq install gstreamer-devel -sudo zypper -nq install gstreamer-plugins-base-devel - -# pulseaudio (qtmultimedia) -sudo zypper -nq install libpulse-devel - -# cups -sudo zypper -nq install cups-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh deleted file mode 100755 index e4281588..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env bash -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" - diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index c0d75ff6..544364b0 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version @@ -76,6 +76,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 index 8f94b3d5..8f94b3d5 100644 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 index 57428310..57428310 100644 --- a/coin/provisioning/qtci-windows-10-x86/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 deleted file mode 100644 index 6a398725..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/01-remove-ms-zune.ps1 +++ /dev/null @@ -1,2 +0,0 @@ -Remove-AppxPackage Microsoft.ZuneVideo_10.17092.13511.0_x64__8wekyb3d8bbwe -Remove-AppxPackage Microsoft.ZuneMusic_10.17083.18321.0_x64__8wekyb3d8bbwe diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 index 57428310..57428310 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 index d019fc92..72ac1ca7 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 @@ -34,10 +34,10 @@ # Visual Studios are pre-provisioned to tier1 images # MSVC 2015 Update 3 -Write-Output "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt +Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt # MSVC 2017 -Write-Output "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt +Write-Output "Visual Studio 2017 = Version 15.8.5" >> ~\versions.txt # MSVC 2017 Build Tools Write-Output "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 new file mode 100644 index 00000000..be9a3634 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/10-install-msys2.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-msys2.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 deleted file mode 100644 index fe1aec7d..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\windows\msvc_2015_update3_patch.ps1" - diff --git a/qt3d b/qt3d -Subproject fed848f7dcff99cf5adb3b7b45190826b3dcf89 +Subproject 06f41f15abaacc9f6f7acb8e51d2cfb68705a92 diff --git a/qtactiveqt b/qtactiveqt -Subproject 8fb524d9d7abfb159b97cec48eddced867568cb +Subproject 5c3a2a2de9bc8c7d76afbc042f94b388b53ce89 diff --git a/qtandroidextras b/qtandroidextras -Subproject c5e4882e75c37f2c0462141793dffc4fa6710fc +Subproject 17985125ca974456900bca463b98a47af9ce497 diff --git a/qtbase b/qtbase -Subproject 3308a81942d33f524b3fc61492bd67c4e2b9072 +Subproject 166889ddcbaac91c403a840f138f25bc2907b68 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 9a7c0f06fd375a1d7e07082338a4fa0cfc36075 +Subproject 1319e0965f6008f44f9216a7bb76e106a171076 diff --git a/qtcharts b/qtcharts -Subproject d7b0312363a868d1d50ef4af032b57a36d50b24 +Subproject 19fb5aa9b6c76b27cdc7eea9dad792b4e93309e diff --git a/qtconnectivity b/qtconnectivity -Subproject 3d0ac0c8e62e141f1e3300ac9b637d68bcc37ba +Subproject b4c225c747d91122f7c145b337ad611c025c1ab diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 13c950f006160b8aa8aae559fcbd75d7d4f9be1 +Subproject e4cd15e388f675a80a9c257655a580b1b53c240 diff --git a/qtdeclarative b/qtdeclarative -Subproject f01e72a82b59c214ce4b0a6ecefb604bc66ddd3 +Subproject bb882f433b6cf6fca56049df6b654fb6a39a7ca diff --git a/qtdoc b/qtdoc -Subproject 5c1d814079fbe77e4bd02c2a00385b891a37173 +Subproject c1c45f8d8cfe67b2605baad2ab72a4ec43aef3e diff --git a/qtgamepad b/qtgamepad -Subproject 19ca9370409d82a00841372df2e8bc0bf35148e +Subproject 653900f1d4801f184ddd9725f0806406a4021b8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 9490960f5fb4e56058f6b8c096617e94e9e5611 +Subproject fc82323538ffde51ab03a38db4d6e61b372a091 diff --git a/qtimageformats b/qtimageformats -Subproject 293000886199483ea63ccc5e71ac0bf1c3071a0 +Subproject dabcde3195e47683b31f0050c5de067863eb64e diff --git a/qtlocation b/qtlocation -Subproject 1e88a55671d6514894a663bf207d783e8575978 +Subproject a6ac8739a23c4101a3c582aa89281aa90027128 diff --git a/qtlottie b/qtlottie new file mode 160000 +Subproject 553ec1bc799f344a12e34c91720e13a469d8536 diff --git a/qtmacextras b/qtmacextras -Subproject 576926d0608b1d37b88d56b8bf873aeb1c57d14 +Subproject 1196b92a6428b22c56f1df3fc70337c02972d9d diff --git a/qtmultimedia b/qtmultimedia -Subproject 21f752806077e05249f9c357f14e9f0294920ec +Subproject 95818e11936e8c85172b2675132a535d5a45015 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject effb9ec6f5abfe50277de410769e7d8e01e6d97 +Subproject f52ff01d38400d5343af9149414f3573580a240 diff --git a/qtpurchasing b/qtpurchasing -Subproject 9a451391f077093307cc7f3ac8cee5a0f6a168f +Subproject f9ab15009bdc249d4f19513fc9730d81f5b50fe diff --git a/qtqa b/qtqa -Subproject 355763de979cd635078dfad20a075864dcc2284 +Subproject 604a768dc4f7ee2a0f39b146c151f9eb2397d6e diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 8c015b374b66c952ff43150f0ffcee433a9eb41 +Subproject 44fe49e573539e22709c2d5c996f1ca9ee8fd76 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 5ca18a3f21083151b771f0efa2a2605f183c816 +Subproject e1a6475a2a3ea46b2afbc2f154c18b255466dad diff --git a/qtremoteobjects b/qtremoteobjects -Subproject c4e5f629c09d197c49fd1be59a8fdfeaba064c1 +Subproject e69037fe3160964d45920ee33d606ec2a72a6e3 diff --git a/qtrepotools b/qtrepotools -Subproject df3090cb05817277b0dd3586e9e2e7a673955a2 +Subproject 50529226884176e3910f84a68fb260a3cb9fb3b diff --git a/qtscript b/qtscript -Subproject 484e9de6d86d011bd349890cba87a25554b0f67 +Subproject 732962319eeae2881890bd146146e7e6f486c9f diff --git a/qtscxml b/qtscxml -Subproject 80a9f4dfd078c4df1bc2c7fa279d637debfd672 +Subproject 68c9234b67ca0939fcf6607d87bda90b9317056 diff --git a/qtsensors b/qtsensors -Subproject a4b7814ec945b979bafdc6de60800bbddd4d240 +Subproject 299bbcdb59198910188ebe1abbae1d9868d8ae6 diff --git a/qtserialbus b/qtserialbus -Subproject 673495d2eb1fe9cdf701351d75c2203c80ab6ba +Subproject 562113342f2b232d38a3ea05e84b8d258479921 diff --git a/qtserialport b/qtserialport -Subproject 72a80def162e7a3a56997c6080db58a9874a23b +Subproject c1766c64f9f76c075aa1f1723f193bcbfd5e79b diff --git a/qtspeech b/qtspeech -Subproject 7529a90059a72681ff106500ac64ce6c00e9b22 +Subproject bda364fe3df7dd6269e2d284fcc2c6d239a962b diff --git a/qtsvg b/qtsvg -Subproject 6292c75fb742f2877630ec22fb3a9b0d3afc9a9 +Subproject 7e7ed705efc51134b27820d76beceefc62ab0b3 diff --git a/qttools b/qttools -Subproject 6c1ca200d52d671b1f33125d99d6e0cd6d46963 +Subproject 7203e6a94ced619eadbc14aedf73d4053067166 diff --git a/qttranslations b/qttranslations -Subproject ebd5ad86ac35fc27e58489d1389abb6cacfb2b1 +Subproject a049a619d2f0cbe6e57aaf50202b7ade244cf95 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 717a56c54382942425a66e012f41782593e0444 +Subproject 17b5efd7bfdcb6afedb2ba5fbe263a86efb570f diff --git a/qtwayland b/qtwayland -Subproject 85bb158ddf08aca4d76c13c6a9fcd2637d84d3e +Subproject 8b69d52db792c3910be53321df44b5c57baa694 diff --git a/qtwebchannel b/qtwebchannel -Subproject fc891dad209725113f49f42cfd59a5ced6ff89d +Subproject 11c8706b6c0ca3f9c0d195641fd0eea816899ac diff --git a/qtwebengine b/qtwebengine -Subproject 26ac59af2306b4f6f83e791bb3e828b9f7b1a72 +Subproject 46ac6474ea4f5592863dbcb295e53080b2e5608 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 10a64558ce927e2df0f2dfe7ff3d786d4737c06 +Subproject c21dbf122e57ee90436de65a7f868fd8ce5a377 diff --git a/qtwebsockets b/qtwebsockets -Subproject 30794c6737a1105bdcd840e41ff374ece3bc60e +Subproject 142d9798d262a41c09a9c43f3ae3a82c771fc80 diff --git a/qtwebview b/qtwebview -Subproject d55be9749b2dfc0e047da9e1d10a240923880a4 +Subproject 159945f822e098d8d169ec1379675d8a664cea9 diff --git a/qtwinextras b/qtwinextras -Subproject f68e98026f6e37cf5db51e24bc90d3cf9be9d14 +Subproject 1ec9cfb3379b40132f8d61a6b8b9145df4ac0a0 diff --git a/qtx11extras b/qtx11extras -Subproject 941623379f15db113551e7e887b0af58da17865 +Subproject ce6b90e597e93252a56d37e616fbd473e1ae8c3 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 8db585da3bb29c51be9ec8f7b719157e494b174 +Subproject 9cfa05ed8beb0a9f323070060115e56064be9f3 |