diff options
46 files changed, 49 insertions, 44 deletions
diff --git a/.gitmodules b/.gitmodules index 1478d69c..9884474c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12.4 + branch = 5.12 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12.4 + branch = 5.12 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12.4 + branch = 5.12 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12.4 + branch = 5.12 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12.4 + branch = 5.12 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12.4 + branch = 5.12 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12.4 + branch = 5.12 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12.4 + branch = 5.12 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12.4 + branch = 5.12 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12.4 - status = addon + branch = 5.12 + status = ignore [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12.4 + branch = 5.12 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12.4 + branch = 5.12 status = addon diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 5417e7ee..2032cf9a 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,6 +10,7 @@ qtci-windows-10-x86_64-10 MSVC2017 qtci-linux-Ubuntu-16.04-x86_64-2 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-Ubuntu-18.04-x86_64 GCC OutOfSourceBuild Documentation -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib +qtci-linux-Ubuntu-18.04-x86_64 GCC DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl qtci-linux-openSUSE-42.3-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 ICC_18 DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DisableTests -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh index 44ff654b..44c63e2f 100755 --- a/coin/provisioning/common/linux/gcc.sh +++ b/coin/provisioning/common/linux/gcc.sh @@ -37,6 +37,8 @@ # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" set -ex @@ -97,6 +99,9 @@ function InstallGCC() { sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority" fi + echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf + echo "/usr/local/lib32" | sudo tee -a /etc/ld.so.conf.d/gcc-libraries.conf + sudo ldconfig -v echo "GCC = $version" >> ~/versions.txt } 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..d6c04d5b 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 @@ -108,7 +108,7 @@ installPackages+=(g++-multilib) # python3 development package installPackages+=(python3-dev) installPackages+=(python3-pip) -installPackages+=(python3-virtualenv) +installPackages+=(virtualenv) installPackages+=(python3-wheel) # python2 development package installPackages+=(python-dev) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh index 62940e21..947583da 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -5,5 +5,4 @@ set -ex # shellcheck source=../common/linux/gcc.sh source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" -InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400 - +InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2 diff --git a/qt3d b/qt3d -Subproject eab523957ac77542758f0172f0396c865933b20 +Subproject d48e15d235645cbd6b08cd5fc5eb7ae84678c1f diff --git a/qtactiveqt b/qtactiveqt -Subproject 5bf0cff9c707186379031782e909dd751bac61b +Subproject d9aa0a60c1c627f141fad2eeba3c38480a1b61d diff --git a/qtandroidextras b/qtandroidextras -Subproject dcae0e1072ebc04af7578953c0ff70bbf535cf6 +Subproject 77485c52210cb3d6a2899498331986ab6475681 diff --git a/qtbase b/qtbase -Subproject d8efc8d718e3b3a0464f321e740541f5b221a5d +Subproject 0ef61500059e6ebed30b76140a78e6e9149b318 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 8ca2dfa61c61280205af9ff9a6607a1794b5cd2 +Subproject 9fe40cb19ef5196cd84d58faea82e023d6c32d3 diff --git a/qtcharts b/qtcharts -Subproject e7051e75c7004baf19a296cbb4f08a80f397b3f +Subproject 166eae80efe685ffbc7097ebdbe3e68d12e7d2e diff --git a/qtconnectivity b/qtconnectivity -Subproject f6be1f73a810514335ab3d27e1d05825a36b06a +Subproject d67ca376b2111717de88596888f315fba05ef9c diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 41d93443ab264b4a0869290929e2de84b4a3c49 +Subproject eef5e52668df079d1c401814d11dad22ec94e16 diff --git a/qtdeclarative b/qtdeclarative -Subproject 48b4df598c88782f031f3df62964e159feeb20f +Subproject e9520ec84c95e10a6826b2289e46552a2d44689 diff --git a/qtdoc b/qtdoc -Subproject e42afb29c0e3b0c7e4263b68a1988ac415d8f52 +Subproject 2fa86c42799b05f73797073061de1b1cbc7caef diff --git a/qtgamepad b/qtgamepad -Subproject 4ac7a6de3e5ed4e44ba8923852c71bcc8327d95 +Subproject a266d285e26a87ef0010dc05f5341e68a33fcb9 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 7b92bc10c5bb7b5c87421198895eae632d10702 +Subproject 8f6ebb395b3f9d6056b5d6bf76f6af6f43cab88 diff --git a/qtimageformats b/qtimageformats -Subproject 43ca053b50d7ed663c6734879070186bf28a0d2 +Subproject 79bf227d7eba5eeb201ccdfee9b151ccb766df2 diff --git a/qtlocation b/qtlocation -Subproject 2e02797471e55684a71979f330a4f507e86e5bc +Subproject 2b2a5ba9abb0d2f7043cfdfdc144751aa5dd645 diff --git a/qtmacextras b/qtmacextras -Subproject 98fd0eb0f72f18fc4eca16137566ea6ca3479c7 +Subproject 39f9523df09f5333f277ad2b7bfb625df72c2ae diff --git a/qtmultimedia b/qtmultimedia -Subproject d73b59093ec6fed8138460adcdf3ea0a45519a3 +Subproject 9bbf9f0d862b8d458e59690d36641618fb101b4 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject d0b28afe0e57857152a61f4a1d2b0dfe7a4bb6b +Subproject eccfd1e04fde60022afdc80678316ecbd06031d diff --git a/qtpurchasing b/qtpurchasing -Subproject 780bf06b9a938380eb9221532465db0d3069f38 +Subproject 710a399d4e8a9132172d45971152d18e1e16b3a diff --git a/qtqa b/qtqa -Subproject 9ebbac76e9e3141df8acee48f4a60cdceb61424 +Subproject 3908dc23d77780a76d60c247c91914b9ba6cbd3 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 8105e3ed0e77f363ccc6406edd38082ac5cef27 +Subproject bc38b5338000ab85564272077b27c88bd472aa0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 783bfd2182f667817213faf3f54a285057bd245 +Subproject 188773bd1383883cd7247b6ded0d0b1a4168915 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 0cdd47b80f26f5e7bb86b34ce31f07bbe2f4964 +Subproject c79feacd40f57d4a38500bd94fa1f549c1ac47e diff --git a/qtscript b/qtscript -Subproject a3d8a431aaed65ee49cc9405f4f1ebd9e268a00 +Subproject 47ac322e3e9a6f6350146d65bc87b981bba45b0 diff --git a/qtscxml b/qtscxml -Subproject 45626a32aff0ff2ce279a94e18d58aee5583b4f +Subproject 54c2106a5fcc49eecd1b85ec93bf2f44c69a0d3 diff --git a/qtsensors b/qtsensors -Subproject 6e30eaa1bda78b16fe9f467ad328a085bb3def0 +Subproject ed0b4ed792504dc68d2f009ca19d69ef856002b diff --git a/qtserialbus b/qtserialbus -Subproject 76a08e3d59a0ef7020464d73df6dd5a01e58c23 +Subproject 9e51a7f46eb74b4fe5c18160845f51d522f8bdd diff --git a/qtserialport b/qtserialport -Subproject 68327f976994cc941b58c2b2e3eb7726809509f +Subproject 029d399148c1a0b6d7c4e9a36a5be348558ceee diff --git a/qtspeech b/qtspeech -Subproject 8a3b10828920bdf94fdd7b6a1f6b2024d829244 +Subproject 4d83c0e3d3e231778ed805e36f546926191bfe2 diff --git a/qtsvg b/qtsvg -Subproject 29249cf721863cdebdce5d48ded59e295f58a71 +Subproject 21f98a15c47c3d8d19f9e6b38f98f6324abe6b5 diff --git a/qttools b/qttools -Subproject af241efd145cd6e9c8b8b4107fc0a7b78da16c4 +Subproject e42dd0a13ebf37f7402a4cf09a6fb62b8c740c7 diff --git a/qttranslations b/qttranslations -Subproject 41dc0e7c0f3e1183b22d85114b013925a1d4431 +Subproject 6a580f7b92cca74c824fca66c136df84725ecc6 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 9d6cdde0ae4213eb7cc53baab22e183f3c93507 +Subproject a826da7d9bee9bd96c84ceaba5f102f66fc538c diff --git a/qtwayland b/qtwayland -Subproject 2e4246ee71dd6689d3731e380f393185a1e3bd8 +Subproject ec9057081f1094fbfeb11449bc533997731e407 diff --git a/qtwebchannel b/qtwebchannel -Subproject b79562247f6dfe2ad26804c0eca891a529179dd +Subproject ee896f24693e8ac71102836cfa7550ab337f8ed diff --git a/qtwebengine b/qtwebengine -Subproject 80674ddb452c6926a01fcb0f35699252cf45204 +Subproject 3b04c83620a465a4f8876413c37696fbbc3a23d diff --git a/qtwebglplugin b/qtwebglplugin -Subproject ccf8f2f2b1729149965921462d9c2d3e5dd8f57 +Subproject 23c1d55be7ee46c8950fe76c9740dc0462f1b46 diff --git a/qtwebsockets b/qtwebsockets -Subproject 9db762ad97338567a614177564f68fee780fefc +Subproject f582f7ecbd35d9825fc17ecc9c4bcca7b9cb28a diff --git a/qtwebview b/qtwebview -Subproject 9ca4eec0bc5c0fa9d4ab76df5eb06129765bc09 +Subproject 22247ff992fe5050d2438a064b572059aca7e39 diff --git a/qtwinextras b/qtwinextras -Subproject ab937fb390696a1adf6a97d820c900a53d316a6 +Subproject f2196b174bb0565055c8bc935b50ca90da5e6ff diff --git a/qtx11extras b/qtx11extras -Subproject 2fe9b682bbba406356a38cc4661330259dd97b9 +Subproject bb5b7fd2e3fc365ec746d7e756556d410c5841d diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 4efc4b1d0c11b68e1140734f659b22ce266d1bd +Subproject ce43c8f6270518d801d91124ea1f32309c8e119 |