diff options
71 files changed, 307 insertions, 51 deletions
diff --git a/.gitmodules b/.gitmodules index 145fac4f..0def5d8d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = dev status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = dev status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = dev status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = dev status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = dev status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = dev status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.9 + branch = dev status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = dev status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = dev status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = dev status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.9 + branch = dev status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.9 + branch = dev status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9 + branch = dev status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = dev status = addon [submodule "qtsystems"] depends = qtbase @@ -136,27 +136,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = dev status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = dev status = addon [submodule "qt3d"] depends = qtdeclarative recommends = qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = dev status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = dev status = addon [submodule "qtquick1"] depends = qtscript @@ -169,51 +169,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = dev status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = dev status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = dev status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = dev status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = dev status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = dev status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = dev status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = dev status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -226,14 +226,14 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = dev status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = dev status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel @@ -241,87 +241,94 @@ serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = dev status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = dev status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = dev status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = dev status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = dev status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = dev status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = dev status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = dev status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9 + branch = dev status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9 + branch = dev status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9 - status = preview + branch = dev + status = addon [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9 - status = preview + branch = dev + status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9 + branch = dev + status = preview +[submodule "qtwebglplugin"] + depends = qtbase qtwebsockets + recommends = qtdeclarative + path = qtwebglplugin + url = ../qtwebglplugin.git + branch = dev status = preview diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index fec2a44c..8e030bbd 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -17,7 +17,6 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +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/InstallPKGFromURL.sh b/coin/provisioning/common/InstallPKGFromURL.sh index 07f23d62..bd916cec 100644 --- a/coin/provisioning/common/InstallPKGFromURL.sh +++ b/coin/provisioning/common/InstallPKGFromURL.sh @@ -69,7 +69,7 @@ function InstallPKGFromURL { esac } echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + echo "$expectedSha1 *$targetFile" | /usr/bin/shasum --check || throw $ExceptionSHA1 echo "Run installer on PKG" sudo installer -package "$targetFile" -target "$targetDirectory" || throw $ExceptionInstallerPKG echo "Removing file '$targetFile'" diff --git a/coin/provisioning/common/python3.ps1 b/coin/provisioning/common/python3.ps1 new file mode 100644 index 00000000..3c565874 --- /dev/null +++ b/coin/provisioning/common/python3.ps1 @@ -0,0 +1,70 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## 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$ +## +############################################################################# + +param([Int32]$archVer=32) +. "$PSScriptRoot\helpers.ps1" + +# This script installs Python $version. +# Python3 is required for building some qt modules. + +$version = "3.6.1" +$package = "C:\Windows\temp\python-$version.exe" +$install_path = "C:\Python36" + +# check bit version +if ( $archVer -eq 64 ) { + echo "Running in 64 bit system" + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version-amd64.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version-amd64.exe" + $sha1 = "bf54252c4065b20f4a111cc39cf5215fb1edccff" +} +else { + $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.exe" + $sha1 = "76c50b747237a0974126dd8b32ea036dd77b2ad1" +} + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +echo "Installing $package..." +cmd /c "$package /q TargetDir=$install_path" +echo "Remove $package..." +del $package + +[Environment]::SetEnvironmentVariable("PYTHON3_PATH", "$install_path", [EnvironmentVariableTarget]::Machine) +[Environment]::SetEnvironmentVariable("PIP3_PATH", "$install_path\Scripts", [EnvironmentVariableTarget]::Machine) + +# Install python virtual env +cmd /c "$install_path\Scripts\pip3.exe install virtualenv" diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh new file mode 100755 index 00000000..56e82386 --- /dev/null +++ b/coin/provisioning/common/python3.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## 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 python3 + +source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/python-3.6.1-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" +SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv + +echo "export PYTHON3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc +echo "export PIP3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc +echo "python3 = 3.6.1" >> ~/versions.txt diff --git a/coin/provisioning/common/vc_redist.ps1 b/coin/provisioning/common/vc_redist.ps1 new file mode 100644 index 00000000..95567669 --- /dev/null +++ b/coin/provisioning/common/vc_redist.ps1 @@ -0,0 +1,64 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## 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$ +## +############################################################################# + +param([Int32]$archVer=32) +. "$PSScriptRoot\helpers.ps1" + +# This script installs Visual C++ Redistributable for Visual Studio 2015 +# This is a dependency of the current python3 version + +# check bit version +if ( $archVer -eq 64 ) { + echo "Running in 64 bit system" + $arch = "x64" + $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x64.exe" + $sha1 = "3155cb0f146b927fcc30647c1a904cd162548c8c" +} +else { + $arch = "x86" + $externalUrl = "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe" + $internalUrl = "http://ci-files01-hki.ci.local/input/windows/vc_redist.x86.exe" + $sha1 = "bfb74e498c44d3a103ca3aa2831763fb417134d1" +} + +$package = "C:\Windows\temp\vc_redist.$arch.exe" + +echo "Fetching from URL..." +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +echo "Installing $package..." +cmd /c "$package /q" +echo "Remove $package..." +del $package diff --git a/coin/provisioning/common/winrtrunner.ps1 b/coin/provisioning/common/winrtrunner.ps1 new file mode 100644 index 00000000..f433ac7a --- /dev/null +++ b/coin/provisioning/common/winrtrunner.ps1 @@ -0,0 +1,10 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\winrtrunner.zip" + +Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip -OutFile $zip +Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42" +Extract-Zip $zip C:\Utils\winrtrunner +Remove-Item $zip + +[Environment]::SetEnvironmentVariable("CI_WINRTRUNNER_PATH", "C:\Utils\winrtrunner", "Machine") diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh index b419f217..0003127a 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -2,3 +2,17 @@ # version: provided by default Linux distribution repository # needed to build pyside sudo yum install -y python-devel python-virtualenv + +# install the EPEL repository which provides python3 +wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm +sudo rpm -Uvh epel-release-latest-6.noarch.rpm +sudo rm -f epel-release-latest-6.noarch.rpm + +# install python3 +sudo yum install -y python34-devel + +# install pip3 +wget https://bootstrap.pypa.io/get-pip.py +sudo python3 get-pip.py +sudo rm -f get-pip.py +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh index ad1bf18f..ff25f463 100644 --- a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh @@ -1,5 +1,18 @@ # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside -sudo subscription-manager refresh sudo yum install -y python-devel python-virtualenv + +# install the EPEL repository which provides python3 +wget https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm +sudo rpm -Uvh epel-release-latest-7.noarch.rpm +sudo rm -f epel-release-latest-7.noarch.rpm + +# install python3 +sudo yum install -y python34-devel + +# install pip3 +wget https://bootstrap.pypa.io/get-pip.py +sudo python3 get-pip.py +sudo rm -f get-pip.py +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh index 205f598b..d4cd60e8 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh @@ -3,4 +3,6 @@ # needed to build pyside sudo apt-get update -sudo apt-get install -y python-dev +sudo apt-get install -y python-dev python3-dev python3-pip + +sudo pip3 install virtualenv diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 8b28c981..5cd9a77d 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -82,6 +82,8 @@ try sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT # Support for cross-building to x86 (needed by WebEngine boot2qt builds) sudo DEBIAN_FRONTEND=noninteractive apt -q -y install g++-multilib || throw $ExceptionAPT + # python3 development package + sudo DEBIAN_FRONTEND=noninteractive apt -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT ) catch || { case $ex_code in diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh index b14e94a6..4f4fd6ea 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh @@ -41,7 +41,7 @@ trap "sudo rm -fr $TEMPDIR" EXIT cd $TEMPDIR git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua cd freeopcua -git checkout 57b6993d39b6761af773fa4fa37c3fbd39c764f1 +git checkout ca75e05a8e63d88dbfc259e1251f405106411b66 mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh new file mode 100644 index 00000000..0b42d5a1 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/08-pythondev.sh @@ -0,0 +1,8 @@ +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside +sudo pkcon -y refresh +sudo pkcon -y install python-devel python-virtualenv + +# install python3 +sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh index 97ce19ba..272952ed 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh @@ -48,4 +48,4 @@ source "${BASH_SOURCE%/*}/../common/try_catch.sh" # shellcheck source=../common/install_xcode.sh source "${BASH_SOURCE%/*}/../common/install_xcode.sh" -InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/macos_10.12_sierra/Xcode_8.2.1.xz 8.2.1 +InstallXCode /net/ci-files01-hki.ci.local/hdd/www/input/mac/Xcode_8.3.1.xz 8.3.1 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh new file mode 100644 index 00000000..cd4e3fd9 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9-x86_64/025-python3.sh @@ -0,0 +1 @@ +source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 new file mode 100644 index 00000000..4de520b2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/winrtrunner.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\winrtrunner.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 new file mode 100644 index 00000000..4de520b2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/winrtrunner.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\winrtrunner.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-7-x86/python3.ps1 b/coin/provisioning/qtci-windows-7-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 new file mode 100644 index 00000000..ad3d5950 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/python3.ps1 b/coin/provisioning/qtci-windows-8-x86/python3.ps1 new file mode 100644 index 00000000..164fbe43 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 new file mode 100644 index 00000000..6070c80b --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/07-vc_redist.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vc_redist.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 new file mode 100644 index 00000000..b0c21996 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/python3.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python3.ps1" 64 diff --git a/qt3d b/qt3d -Subproject cadfd44c77de9ad3d66e936df140e4ba6efb0d7 +Subproject 2a9e7345d970ac3c977a8e56e81d2eb332b0517 diff --git a/qtactiveqt b/qtactiveqt -Subproject d36199ce84191e029bb5c81382367976bd0ade8 +Subproject 706c07ffb3f9ba473c71f4c8b66be94b810500c diff --git a/qtandroidextras b/qtandroidextras -Subproject a511c60514d7cc0ff876d13fa4a3800c7e25cbf +Subproject da807f68d37fb3159196627904a1554405df90f diff --git a/qtbase b/qtbase -Subproject 70b976ece1ad36b1e59d2b67f6cda8ff6b86017 +Subproject 06904a7a772357479a1b78b8345716f8d0711b4 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 25447e889dc43c0831100bee1625a6f667d364c +Subproject eb28146d3f2984a29a8917a36c1327e1d0becec diff --git a/qtcharts b/qtcharts -Subproject eedb1c76538cac3c11e7ac57eaa571d6ce07a63 +Subproject dbb55fba566fd3878b5ef76a2216f0c3f961147 diff --git a/qtconnectivity b/qtconnectivity -Subproject b0089abb05e6f60cc252068be1ba40be32e29bd +Subproject 4feae652c9c12ec4e5ef4c7bd575f8f316494ad diff --git a/qtdatavis3d b/qtdatavis3d -Subproject cec5d284e2b70199ab28c4e0ff7a67d79f53127 +Subproject 096b9122b939de19836b75718156cc8155e8462 diff --git a/qtdeclarative b/qtdeclarative -Subproject b9767f03bdfcc06dae49661150fbeb0f19a8547 +Subproject a670d760e351987ad23b445bfb08f6add1fb067 diff --git a/qtdoc b/qtdoc -Subproject df47da6534e40ca28c8067ac41fc6323bc59a50 +Subproject 01b02ef11fd5d12af71c0eefe9f9fa72336b681 diff --git a/qtgamepad b/qtgamepad -Subproject 17c9df2e5945a06944d8e9d75d1cba25bc885ec +Subproject d4c6ba6afe1d7a3165f1ac108fef6eb2b994175 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 698eb995b8c77cdfb1f151bd9ad46f8db87cfb2 +Subproject c1c259ea76c4d8c94f6d96c3fd0bbbece25785b diff --git a/qtimageformats b/qtimageformats -Subproject 144a3535db9f95e60972d3c3b6eaceb65a60457 +Subproject 73f25d1a411ede3f78e8468999b4d362c51180d diff --git a/qtlocation b/qtlocation -Subproject d4cb4961ed0a15d0746d96da38228787658d87b +Subproject 40b8d8f0b1c4d3dfdb63994f1c5d9e16760496f diff --git a/qtmacextras b/qtmacextras -Subproject cb8ec72ad6398e442d9a6182fd2f71274509f8d +Subproject 1dae0da8b892fd93e8d09e95679cba3f419e66e diff --git a/qtmultimedia b/qtmultimedia -Subproject eed32d94de9faca7380f7497e7ab0d119ef3cf5 +Subproject 0b0c0e72d62972a0205d20afbb75147576c342d diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 11b711bc97b66b5976d24f9411fe76a2f858eab +Subproject 24b2d5662b25314c4e377c8f4574d9c04a1fbbb diff --git a/qtpurchasing b/qtpurchasing -Subproject 9c87f11f6d7ae46150b540cf2eee14e8217bb85 +Subproject 3d279f86ca9b3f8cf8c24016afeb68f58b63a69 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 490f0704ac817c3e5d87e74b665cc770f7ab28f +Subproject 8b36cdd25761348c285305edec1bf861a924e85 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject cc188f897af27daf47b0937e38ccb76ac2310ab +Subproject 7fffd12ab19278ce0f91f490c9070905ec4f2c2 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 3af6618f98fe53e0288bc604fca4d03b3fd5d90 +Subproject 6ed6274135d63e971c2f9742e71777134bd33d9 diff --git a/qtscript b/qtscript -Subproject 86ee61734e0331459f9cfeb1ad56f773b7e994b +Subproject f200e303829106db6e3ff32e0c492d2677531c3 diff --git a/qtscxml b/qtscxml -Subproject 38eb39a8873f4341cff7165655bb6e2aed40a79 +Subproject 5b89e61c39fb253dae46a8aa48d341a3fd37b4b diff --git a/qtsensors b/qtsensors -Subproject 18132193d83ab94777943c67258d93b3f8b1aa0 +Subproject 368b24bfa00a5ef8fe14cd5e4690333675d7704 diff --git a/qtserialbus b/qtserialbus -Subproject af8f4430c93ae4898075da6f3c62c463a4ee25f +Subproject 88899fddedda325e7f9a7a134827c9387ef8a38 diff --git a/qtserialport b/qtserialport -Subproject 93b539140c06da07d330c9ecad67ab5ed3f9b0c +Subproject 55aa81e9acc736d162d3e4f775814ac91dbf1a8 diff --git a/qtspeech b/qtspeech -Subproject 6f5776269ed427725eae7d7fd8b091886f48220 +Subproject 6961a87380a611d0e40b6033811c5026d56226f diff --git a/qtsvg b/qtsvg -Subproject 0fcd0160662941a9ba800b36671e88d82790bd9 +Subproject af289aced943418128f84c753017d571ed1e4d4 diff --git a/qttools b/qttools -Subproject b2a1066e108678aa66d7e6f22cadf9c01d646ec +Subproject f60ab55b4c68a8f3e3029c122c427806cdf51a1 diff --git a/qttranslations b/qttranslations -Subproject 325a90e07e9dce4e5c915549e6c31a86423dfdd +Subproject e51b921f6fa0fb64a8a7f4159024d1a2f187277 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject a50b87870cf84e14eebfc2b00151342ec0d7e0f +Subproject 7036de7bb303735e7ef0fdf7f2d220bdbc867c7 diff --git a/qtwayland b/qtwayland -Subproject 6f3d69264b6640c94ecfdb89c4bbf90319534b0 +Subproject eebceec16b05439ded58abbbcb2420fe3dcb4c1 diff --git a/qtwebchannel b/qtwebchannel -Subproject 01bd2b3ca88b42b9daac7cb00d196eb90d16857 +Subproject 2dd6a5e7ff769e54065ae8b9b532b2e56f2e311 diff --git a/qtwebengine b/qtwebengine -Subproject 630f7b24f67646b05a2222761b192316123d893 +Subproject 220015dc7bbab22ecb2afdbf1ce524ffe0aadb2 diff --git a/qtwebglplugin b/qtwebglplugin new file mode 160000 +Subproject be972db0f9ef12ace1aeaac5010e0bf44717e30 diff --git a/qtwebkit b/qtwebkit -Subproject 97c4a80a1282c8c3eaa343011286b76fd4838c5 +Subproject db2ecc45564609f940ff564e777f76a1a4b734d diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject a24c780b60d7d8bc00c4a48042cf7f32db777d5 +Subproject 2d68492004bf4ba49cf58c9bd72706cb282cf59 diff --git a/qtwebsockets b/qtwebsockets -Subproject 11a6f90d62a1c6e705a581ebf60b4ed02424d24 +Subproject 191dd6e89fdca2108cfaf405e968a980ec6728e diff --git a/qtwebview b/qtwebview -Subproject 1842c5e5d566117d80f0ca2db1f0fc71a6dfeca +Subproject a358507336d69467011cd80e8fffcb20dc5d013 diff --git a/qtwinextras b/qtwinextras -Subproject fe63ea126822fae40db90a06ab3be47700e85ec +Subproject 4cccbfae21b98afb0cebbce8f586f08e3bef3e5 diff --git a/qtx11extras b/qtx11extras -Subproject c34e05e5d9bdc9ef29c27d105a51d72390f7aef +Subproject 915ee2598030b799aeb67908bae49a70b4079e3 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 6a62e7bb1c3a2d9acb135434c24cd6ee7dc07cb +Subproject 43c28d4084a2c3e63cf02f45c03c9514ee8af2a |