diff options
56 files changed, 319 insertions, 54 deletions
diff --git a/.gitmodules b/.gitmodules index 3d8128eb..1fc98730 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.10 + branch = dev status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.10 + branch = dev status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.10 + branch = dev status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.10 + branch = dev status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.10 + branch = dev status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.10 + branch = dev status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.10 + branch = dev status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.10 + branch = dev status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.10 + branch = dev status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.10 + branch = dev status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.10 + branch = dev status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.10 + branch = dev status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.10 + branch = dev status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.10 + branch = dev status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.10 + branch = dev status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.10 + branch = dev status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.10 + branch = dev status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.10 + branch = dev status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.10 + branch = dev status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.10 + branch = dev status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,114 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.10 + branch = dev status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.10 + branch = dev status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.10 + branch = dev status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.10 + branch = dev status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.10 + branch = dev status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.10 + branch = dev status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.10 + branch = dev status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.10 + branch = dev status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.10 + branch = dev status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.10 + branch = dev status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.10 + branch = dev status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.10 + branch = dev + status = preview +[submodule "qtopcua"] + depends = qtbase + path = qtopcua + url = ../qtopcua.git + branch = dev status = preview diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 15c0a761..38dbd1c1 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -15,6 +15,7 @@ qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packagin qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 index f835059a..cabc906c 100644 --- a/coin/provisioning/common/install-mingw.ps1 +++ b/coin/provisioning/common/install-mingw.ps1 @@ -58,7 +58,7 @@ function InstallMinGW Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} echo "Adding MinGW environment variable." - [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine) + [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2), [EnvironmentVariableTarget]::Machine) echo "Cleaning $mingwPackage.." Remove-Item -Recurse -Force "$mingwPackage" diff --git a/coin/provisioning/common/libclang.ps1 b/coin/provisioning/common/libclang.ps1 index a4a9c870..02a3974a 100644 --- a/coin/provisioning/common/libclang.ps1 +++ b/coin/provisioning/common/libclang.ps1 @@ -4,29 +4,39 @@ param([Int32]$archVer=32) # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. +# Starting from Qt 5.11 QDoc requires Clang to parse C++ + Get-Content "$PSScriptRoot\..\common\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' } +$zip = "c:\users\qt\downloads\libclang.7z" +$baseDestination = "C:\Utils\libclang-" + $libclang_version if ( $archVer -eq 64 ) { $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z" -} else { - $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" - $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" + $destination = $baseDestination + "-64" + + Download $url $url $zip + Verify-Checksum $zip $sha1 + + C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\ + Rename-Item C:\Utils\libclang $destination + del $zip } -$zip = "c:\users\qt\downloads\libclang.7z" -$destination = "C:\Utils\libclang-" + $libclang_version +$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" +$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" +$destination = $baseDestination + "-32" Download $url $url $zip Verify-Checksum $zip $sha1 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils\ Rename-Item C:\Utils\libclang $destination - -[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $destination, [EnvironmentVariableTarget]::Machine) del $zip + +[Environment]::SetEnvironmentVariable("LLVM_INSTALL_DIR", $baseDestination + "-_ARCH_", [EnvironmentVariableTarget]::Machine) echo "libClang = $libclang_version" >> ~/versions.txt diff --git a/coin/provisioning/common/open62541.sh b/coin/provisioning/common/open62541.sh new file mode 100644 index 00000000..d5f6dbe3 --- /dev/null +++ b/coin/provisioning/common/open62541.sh @@ -0,0 +1,51 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# + +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR + +sudo pip install six + +git clone https://github.com/open62541/open62541.git open62541 +cd open62541 +git checkout 302003d2448946fa4d8a02cc209b8931d31e975b +mkdir build +cd build +cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=/usr/local -DLIB_INSTALL_DIR:PATH=/usr/local/lib .. +make + +sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/50-open62541.sh new file mode 100755 index 00000000..2871ba93 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/50-open62541.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/open62541.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh new file mode 100755 index 00000000..abbda212 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +. $BASEDIR/../common/sw_versions.txt +VERSION=$libclang_version +URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" +SHA1="bbdbbc0296f42310077539b7247d285386119ef4" + +$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh new file mode 100755 index 00000000..2871ba93 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/open62541.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh index 4f4fd6ea..c23833dd 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh @@ -47,3 +47,4 @@ cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. make sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh new file mode 100755 index 00000000..2871ba93 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh @@ -0,0 +1,36 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/../common/open62541.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/040-qnx700.sh b/coin/provisioning/qtci-macos-10.12-x86_64/040-qnx700.sh new file mode 100755 index 00000000..a039654a --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/040-qnx700.sh @@ -0,0 +1,79 @@ +#!/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$ +## +############################################################################# + +# This script installs QNX 7. + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +targetFolder="/opt/" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +folderName="qnx700" + +ExceptionExtract=100 +ExceptionExtract2=101 + + +try +( + sudo mkdir -p "$targetFolder" + + echo "Extracting QNX 7" + sudo unzip -q "$sourceFile" -d "$targetFolder" || throw $ExceptionExtract + + sudo chown -R qt:wheel "$targetFolder"/"$folderName" + + # Verify that we have last file in zip + if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then + throw $ExceptionExtract2 + fi + + # Set env variables + echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc + echo "QNX SDP = 7.0.0" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionExtract) + echo "Failed to unzip QNX 7." + exit 1; + ;; + $ExceptionExtract2) + echo "The last file in the zip did not get extracted." + exit 1; + ;; + esac +} + diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 index 7c4cd8ac..18f67d66 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -1,9 +1,9 @@ . "$PSScriptRoot\..\common\install-mingw.ps1" -# This script will install MinGW 5.3.0 +# This script will install 64-bit MinGW 5.3.0 -$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" -$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" +$release = "x86_64-5.3.0-release-posix-seh-rt_v4-rev0" +$sha1 = "7EB12DD3EDDCF609722C9552F8592BD9948DA1FC" InstallMinGW $release $sha1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 index e11f2310..490d1f10 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -1,8 +1,8 @@ . "$PSScriptRoot\..\common\install-mingw.ps1" -# This script will install MinGW 6.3.0 +# This script will install 64-bit MinGW 6.3.0 -$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2" -$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B" +$release = "x86_64-6.3.0-release-posix-seh-rt_v5-rev2" +$sha1 = "49E7F8997E3D15C75B1A4DE1C380ABE1FB9B7533" InstallMinGW $release $sha1 diff --git a/qt3d b/qt3d -Subproject 8470becd886d299c1be892d8113dfff21603561 +Subproject 18ce3e68e6db896e9c01cf4df0dd7e9fa714b37 diff --git a/qtactiveqt b/qtactiveqt -Subproject 3f1310a3193a36315dcf0b093451103ad046e1e +Subproject e92a1ce71a355a620b809317778c5d8208906d9 diff --git a/qtandroidextras b/qtandroidextras -Subproject be7089148192ec8e80ea50665ec2df421cf0c4c +Subproject 4d5368ab4fddee4439c808be2b4d56f5fd2dd27 diff --git a/qtbase b/qtbase -Subproject 812bb236dd1622896b6a0ca9bbe1334a69855aa +Subproject 16b76456be8d00ca70715286906b7c482a158dc diff --git a/qtcanvas3d b/qtcanvas3d -Subproject f4d043c71f1f14868b130e46a1a844ee7cdfe50 +Subproject 7de71897132cc771f6177a75fdb3c76ce82659d diff --git a/qtcharts b/qtcharts -Subproject a58dfcb2460a2dd4db83a33bb5349e94303e627 +Subproject 2a74ffa1721d512f1c22a3d33af0ddbbdf953a9 diff --git a/qtconnectivity b/qtconnectivity -Subproject cf0df8be7f4cc809672f98507c1723015a0741b +Subproject a8a4fae732dba2e3783236f4486acde60d03d99 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject cf4bf696641dbcd142f2e0e7057d7cb70b6722e +Subproject 3a965b26e38d551cac80a0e9ba1ffb4bf082a6d diff --git a/qtdeclarative b/qtdeclarative -Subproject 8283bc83857ed8c7d85b61d2dc3b35fa4e96a03 +Subproject 7bedd55551fbe95355b0db11f9d576924e829f9 diff --git a/qtdoc b/qtdoc -Subproject 21c0ac79d94bbf9c999de45cff8086ca94de6d0 +Subproject 035ae612b563b09af83ee7bbf7249976f97b472 diff --git a/qtgamepad b/qtgamepad -Subproject f2983c524d1a3f350b48265a033fd9a3f69c0d7 +Subproject 5f5cebfa1bf5b0c69155b7a5a7c487990cdd634 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject df1c9dbad75010fc967f4a236393fa1de36110f +Subproject bfaeb74ef570c7d95ce4a14e23923256efe824c diff --git a/qtimageformats b/qtimageformats -Subproject 167e7d191b3751a061842e332036dd6989d68a2 +Subproject c7f2abe551c027a8eddb01dd7445dcf1fb82917 diff --git a/qtlocation b/qtlocation -Subproject b2e0a242a8c77d8cff186ef25b8360927c95594 +Subproject 8c6338ab979ed2571971cc761dafb1791a65353 diff --git a/qtmacextras b/qtmacextras -Subproject 2bc33d6e70fcf16aedeead643ab1c39ca090615 +Subproject 50544536b0c720e777b41fae5808dd965f2c5b4 diff --git a/qtmultimedia b/qtmultimedia -Subproject 10304528c20fb9a385c617a38b6be35d1b18598 +Subproject 1cb4027e0a59e1875db88b72afb5833aafbd87e diff --git a/qtnetworkauth b/qtnetworkauth -Subproject bebf6f4816c8025b592c260577dbf09fc0f4ed7 +Subproject 63500da51105c8cf9a8751ac94783cf1a251283 diff --git a/qtopcua b/qtopcua new file mode 160000 +Subproject bdf1a9f6c13b9e225992a27c4af8a753c9c9370 diff --git a/qtpurchasing b/qtpurchasing -Subproject 4b87fcdf70d14b288e4859156403c3d2886020f +Subproject d7cd9c736d2acca98d64ff55c9caccefbb7185b diff --git a/qtqa b/qtqa -Subproject 1110bd076dba536dc6e6304fe8d6ee80f2d5718 +Subproject 5069186722a01ea4f47d13fb79f6939428dcc2e diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 5bc4310529a8ae5cfc18afda1a1b788691448d6 +Subproject d7e43c00584f0d4590162cf0e0b3bd6118ef9d2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject eb7551d5d5e5155606e21158ead1541546bc214 +Subproject 9e1b044afa994cdd77fd256cea78cd144e804d7 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject e6eb6ab12daf76f3e716c0d51ceecdab61e39e4 +Subproject 930c4eafe591c7848163cbff4f72020f4a77d57 diff --git a/qtrepotools b/qtrepotools -Subproject 14431b4087125e247c1e2322e0cd043b78974ce +Subproject ad7346df2ee44889eb9aad1d6781edf4aa7c3ef diff --git a/qtscript b/qtscript -Subproject 0bb3f3017f72cbf8d6866b8baa1820ab3dd8931 +Subproject ea2a8b12fe36203c29f0bd1a85dc41aada905bf diff --git a/qtscxml b/qtscxml -Subproject 81b0d78673f5a632e3891d048be9a08fe48351d +Subproject c5c6aba3b07a44726da96cd2acaed05e67fe3ff diff --git a/qtsensors b/qtsensors -Subproject af1372a4e69d5a7664142df06b0b96d7cd19734 +Subproject 203c9707194f167a70cb27ea47dbb6d7bb3e7d0 diff --git a/qtserialbus b/qtserialbus -Subproject e13737e5de8d3a2653e97de365412c28bd6c612 +Subproject 7272faaa857a31db6b2098af74f7f28202b353d diff --git a/qtserialport b/qtserialport -Subproject 98454fbc2a687a6440ae5e61070ebd6073e8016 +Subproject baa87d4c34059b790c93d210f07696de818e8d5 diff --git a/qtspeech b/qtspeech -Subproject 345d43ec7f349a2b71de784216d0a6fd6c42a0d +Subproject 027166a14684a60e037f39ce5205bb4908610f2 diff --git a/qtsvg b/qtsvg -Subproject 984ba6977201f8fbd94d44a2b67519e1faf458c +Subproject 4dd6b2bfebf02223ef498bf52ce354c628cc960 diff --git a/qttools b/qttools -Subproject 84e40c5f4d78a6d4a0ae1d87323a20ed96f319d +Subproject 836c8f4d34025c52e0e67375c832619232c8597 diff --git a/qttranslations b/qttranslations -Subproject c30c9e0ae178cf3d3f20c058097d8f596f8df88 +Subproject e65c3e30bc56242bee353d4d28f9cf97c9af8a3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 685ae5ca057d37ec2ca909fb08b5610b1829edc +Subproject d5fdcd65620f9215b0b123c25219b6c8f540e62 diff --git a/qtwayland b/qtwayland -Subproject 61f92b6742c96f4974e23893ba6926e4d012cd0 +Subproject ec30d132b300c75d547feafea1dd950285aecba diff --git a/qtwebchannel b/qtwebchannel -Subproject 5e43b6364b6c0bbeb67772581e550fc3e64e900 +Subproject c0900bdd63601fab2ae0df80a7d6c5a0d53355f diff --git a/qtwebengine b/qtwebengine -Subproject 6921ebd6d8bc8bb62d9118c7a1a750f2fd78789 +Subproject b045cf0ab9756a67a5a1037c231199ee9bf2d07 diff --git a/qtwebglplugin b/qtwebglplugin -Subproject f73929c2c6c9229f71470502faab14178d56115 +Subproject d1c638696a641140f67299dd2f8ecac4dec4349 diff --git a/qtwebsockets b/qtwebsockets -Subproject 30e3ccc84031e5530ee38ab4a79026755706720 +Subproject f7c5b8fce9517b3062eeab0ec7e8e46867d1f97 diff --git a/qtwebview b/qtwebview -Subproject f0a48620d5d647ea1e2153a522a948f5b0fedc1 +Subproject a379e86fe5e37f3cac77ae135df2ffb5c7f9ae3 diff --git a/qtwinextras b/qtwinextras -Subproject 8be91fab769e1d55a3146acb04102df67968efd +Subproject 17bdee86da84c6718fc1bbe8cedf5bdf0724083 diff --git a/qtx11extras b/qtx11extras -Subproject 8e4810cf73a4294eacafede22f93f4bda8dab1b +Subproject 5e9053c3232e814a0e1cdbb115e00066107be1b diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 3cd6679d8702fef3f0d3614724375577945fcf0 +Subproject 34cd2d63fc3ce594887f5245896c795ffb8596b |