diff options
47 files changed, 121 insertions, 49 deletions
diff --git a/.gitmodules b/.gitmodules index acf62817..7657f30f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12.8 + branch = 5.12 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12.8 + branch = 5.12 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12.8 + branch = 5.12 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12.8 + branch = 5.12 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12.8 + branch = 5.12 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12.8 + 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.8 + 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.8 + branch = 5.12 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12.8 + branch = 5.12 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12.8 + branch = 5.12 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12.8 + branch = 5.12 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12.8 + branch = 5.12 status = addon diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index a6efe123..66463c44 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -1,3 +1,21 @@ -#!/usr/bin/env bash -# Will install homebrew package manager for macOS -/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null +#!/bin/sh + + +# Will install homebrew package manager for macOS. +# WARNING: Requires commandlinetools + + +set -e + +. "$(dirname "$0")"/../../common/unix/DownloadURL.sh + + +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/mac/homebrew-install.c744a716f9845988d01e6e238eee7117b8c366c9.rb \ + https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install \ + b9782cc0b550229de77b429b56ffce04157e60486ab9df00461ccf3dad565b0a \ + /tmp/homebrew_install +/usr/bin/ruby /tmp/homebrew_install </dev/null + +# No need to manually do `brew update`, the homebrew installer script does it. +### brew update diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh index 84238ebf..e26a1e0d 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,7 +33,11 @@ ## ############################################################################# -set -ex +set -e + +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +sudo chmod 755 /tmp/redhat_ak.sh +/tmp/redhat_ak.sh # refresh local certificates sudo subscription-manager refresh @@ -41,3 +45,4 @@ sudo subscription-manager refresh # Attach available subscriptions to system. This is needed when subscriptions are renewed. sudo subscription-manager attach --auto +sudo rm -f /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-enable-repos.sh new file mode 100755 index 00000000..dfc0e05c --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-enable-repos.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +sudo yum-config-manager --enable rhel-6-workstation-rpms +sudo yum-config-manager --enable rhel-6-workstation-optional-rpms +sudo yum-config-manager --enable rhel-workstation-rhscl-6-rpms + +sudo yum clean all +# As well as this fetching the repository data, we also get a printout of the used repos +sudo yum repolist diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh index 84238ebf..e26a1e0d 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2018 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,7 +33,11 @@ ## ############################################################################# -set -ex +set -e + +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +sudo chmod 755 /tmp/redhat_ak.sh +/tmp/redhat_ak.sh # refresh local certificates sudo subscription-manager refresh @@ -41,3 +45,4 @@ sudo subscription-manager refresh # Attach available subscriptions to system. This is needed when subscriptions are renewed. sudo subscription-manager attach --auto +sudo rm -f /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh index 06e984ec..f7f9e214 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/25-homebrew.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -e BASEDIR=$(dirname "$0") "$BASEDIR/../common/macos/homebrew.sh" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh index 06e984ec..f7f9e214 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/25-homebrew.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -ex +set -e BASEDIR=$(dirname "$0") "$BASEDIR/../common/macos/homebrew.sh" diff --git a/qt3d b/qt3d -Subproject f965d4712a97b69b2d4b43178f8e523668d97a8 +Subproject 0a8af876d1edb8b4cc23ce07828d086e1e4dbe2 diff --git a/qtactiveqt b/qtactiveqt -Subproject ad555db81de1568276b6bb0531cc435d0f9b9aa +Subproject ab173143b5a2c3c6e98edec7b5611308927fa79 diff --git a/qtandroidextras b/qtandroidextras -Subproject 083ab46f4a3e2b80737a2f413ef6130099e37fe +Subproject 03a5f1119ac6d0d1119994688797e36812ec1a3 diff --git a/qtbase b/qtbase -Subproject 08d6cb7673aa51bc0532d71db4134f4912e1476 +Subproject 2161414cdf2790d39eeb25fc35e26c966708d4b diff --git a/qtcharts b/qtcharts -Subproject 76cf047c29a9ae80f712906257f93a0e447bca4 +Subproject 7fd6e5296fded5148aea98d163109ce96232832 diff --git a/qtconnectivity b/qtconnectivity -Subproject a526644f2f2c7359cbe7d50bea09ded3e6c65e4 +Subproject b4282fd32ea06c1d634ea322f682a4c939a0cc8 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 6c6a7eb15b490e59119b7262337dd2c6b8eb65e +Subproject 438e5fcaeb17237040eba235ab05284ab86a0ff diff --git a/qtdeclarative b/qtdeclarative -Subproject 101799f8acdbfc4ebd05f37a7c09544d24b41af +Subproject 74bdd7b588528ecdbffa3872706a9ada2b83b71 diff --git a/qtdoc b/qtdoc -Subproject 666831a863ba96c4a7401615968e109bddc6f09 +Subproject 809837b330175d0b7dc851c1e29ebe292368144 diff --git a/qtgamepad b/qtgamepad -Subproject a047498b16dc6c7abfdd1da5a0385e093b4520c +Subproject 00aa0de520a261fa4b8bd5ef518c8c34683cc41 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 4cab303c83f034cc926e32ec80dae03855a3ab2 +Subproject d74de941255da729cb3276fa57de6ba138d7838 diff --git a/qtimageformats b/qtimageformats -Subproject 6c75b54d3350161efb218bd357ff07bc61a421c +Subproject 6e7fe099f41068aa75fe01e52f1496dfdc12ed7 diff --git a/qtlocation b/qtlocation -Subproject 8a7d656a77138a276d4079f54b888d049097ffc +Subproject 710e71d5b434d96ecaa92b00f9db62278ded736 diff --git a/qtmacextras b/qtmacextras -Subproject 14c9ce986a1de189aa2cfc71b6102efea0fba5a +Subproject 3e7f85f40de620c0ce95f63f639776cb994a827 diff --git a/qtmultimedia b/qtmultimedia -Subproject 194b584ca1381ab5c5bdebfb455901cf2b0bad6 +Subproject 61a6a09429cf8c34a356748a3bb76fc7868a54b diff --git a/qtnetworkauth b/qtnetworkauth -Subproject a282f5d49362a63d9637c69768b8283c5f85e0b +Subproject 5e2756d2677c69fd6b7423e11cffcfdc20fa626 diff --git a/qtpurchasing b/qtpurchasing -Subproject 2191ec56a32cd1c1d6e49e54c5974562ebf3707 +Subproject 61a34538d09520295fb82d34a547cdf656d7e76 diff --git a/qtqa b/qtqa -Subproject af377a33104ccaed85e15f8cc0069c6d35269ca +Subproject 930a856e0769483e9102bddff4acc2e079860f2 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 4687a1dbef006cbffe014b50c4bbd0edf912334 +Subproject b3f6b81abe9db829a73ccce91ffd508048e9fd8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 3c7be4a9911ede96613ffa30f83e1fa5c3d173d +Subproject 516a161956ac0f689502ee823edf2fc11fb0c90 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject e978116774163e6f6f36cbe62be2d9ad797ce9d +Subproject 1fea23b683100a44599494832c3ad6d607e1901 diff --git a/qtrepotools b/qtrepotools -Subproject fbe6d232ba331f08c154465da64a2d256077442 +Subproject d6e8ca40f5331c1016d63fbb18309baafc08ba4 diff --git a/qtscript b/qtscript -Subproject 98e65d35112183bb608f14b3166637ada48c041 +Subproject dd4329e7bcd455c35bd57ecce7dd2011b8f137e diff --git a/qtscxml b/qtscxml -Subproject 5b97c163b3206aca5da15e8296529734d9c0021 +Subproject c2fd00ff6ceac1190467c0e1aa3610cb4ea4bf3 diff --git a/qtsensors b/qtsensors -Subproject 37fa5756b09afad4ad6323293a51a52cbaa5a48 +Subproject 4fe529cc793305c24f58c4c32d57f2923ff7750 diff --git a/qtserialbus b/qtserialbus -Subproject 4a47ea4e53e4e245d8fbced7b1b91bde04d564d +Subproject e75accf13e5b7b1d883c3c7e744e15cd328b4b0 diff --git a/qtserialport b/qtserialport -Subproject c9fd06130537d751edc36a377f7a9a842585167 +Subproject 3da776cb4aab0db9116d9574a5e2cd3881a3954 diff --git a/qtspeech b/qtspeech -Subproject 1cd9809cdeefb97b2dceee55a1a7b0ed3de6f66 +Subproject ea3107a55b43f1751500b6d3b217a069e5d5957 diff --git a/qtsvg b/qtsvg -Subproject 91a4369b99a551779ced748cdb6eb67f6c6f7ac +Subproject b986e07446df36cfa8da5956af74d3df2994132 diff --git a/qttools b/qttools -Subproject 64280d563ed9dd7f61786eb3d07a368b22828aa +Subproject 2d19d030670eb1e354c2f739bf6d08fee8179b2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 0c71f71a28d61ba376ac2241c082f8ca2262fe4 +Subproject 62de17bd2565fe0351ead77b4b57e2a1bb56de9 diff --git a/qtwayland b/qtwayland -Subproject 27c3046fd9caf7d654b81cc7c8fb1d9423377bb +Subproject d18c29931b0bc889fff66bdbde89133544ba052 diff --git a/qtwebchannel b/qtwebchannel -Subproject bf986e4111ed03bd157e868d33dd8f1e6fab2d0 +Subproject ce6b064c813a100bf3c7a230e14b73c426d2f9b diff --git a/qtwebengine b/qtwebengine -Subproject 175b8129d1b0e6d9372de8ce9e1b45ab49fef33 +Subproject d7a7663c58fa81b04b2acc63c3e672fce2f4611 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 07074154be0733ca678d0ce684e8f0cfd492546 +Subproject 351aed887164689b21e85416f6489b70b4cc6f7 diff --git a/qtwebsockets b/qtwebsockets -Subproject 051a396183f7313d15ad444f9ece4b96fb8995d +Subproject 810aec012e3382369005a0f1012857797bb6b54 diff --git a/qtwebview b/qtwebview -Subproject 30edb647a64542c0f4432bd3909e3b6ae5ddcd5 +Subproject 38510e128a5ca134e24c12a2f19c73d05bb18d8 diff --git a/qtwinextras b/qtwinextras -Subproject c787811c72fcf552ab47b4507462214bbd965fa +Subproject 34fa38378b912bb0268d9db57bebe58e446a152 diff --git a/qtx11extras b/qtx11extras -Subproject 40b30b47188c20c6b64e6d0fe29f82a65383678 +Subproject 1ba86278d3b82944e23b32e7be082ca60af54de diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 9a88ab0974c7beaadacc1865f53ea526049c622 +Subproject dcb5ff3b42c5a9fc11414d43832f320910f9d90 |