diff options
65 files changed, 446 insertions, 58 deletions
diff --git a/.gitmodules b/.gitmodules index b4988927..3d8128eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.10 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.10 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.10 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.10 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.10 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.10 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = 5.10 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.10 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,101 +211,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.10 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects + recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9 + branch = 5.10 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9 - status = preview + branch = 5.10 + status = addon [submodule "qtnetworkauth"] depends = qtbase - recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9 - status = preview + branch = 5.10 + status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9 + branch = 5.10 + status = preview +[submodule "qtwebglplugin"] + depends = qtbase qtwebsockets + recommends = qtdeclarative + path = qtwebglplugin + url = ../qtwebglplugin.git + branch = 5.10 status = preview diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index c3af6b5d..5553d7b8 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -10,13 +10,15 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch -qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests +qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests -qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static +qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests +qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 558a756b..3a3af1fe 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -16,6 +16,8 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin 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 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 qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh new file mode 100644 index 00000000..c2fb2e30 --- /dev/null +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -0,0 +1,52 @@ +#!/bin/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$ +## +############################################################################# + +# This script installs paho testing broker + +# shellcheck source=./InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" + +CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0" +PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" +AltUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" +SHA1="532fe145096cdd8d679f425cbfd883289150c968" +targetFolder="/opt/paho_broker" +appPrefix="paho.mqtt.testing-$CommitSHA" + +sudo rm -fr "$targetFolder" +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding MQTT broker path to environment" +sed -i "1iexport MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" ~/.bashrc diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 new file mode 100644 index 00000000..610f22d8 --- /dev/null +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -0,0 +1,50 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +echo "MQTT: Downloading Paho test broker..." +$zip = "c:\users\qt\downloads\pahotest.zip" +$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" +$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip" +$sha1 = "532fe145096cdd8d679f425cbfd883289150c968" + +Download $externalUrl $internalUrl $zip +Verify-Checksum $zip $sha1 + +echo "MQTT: Installing $zip..." +Extract-Zip $zip C:\Utils +Remove-Item $zip + +echo "MQTT: Updating environment..." +[Environment]::SetEnvironmentVariable("MQTT_TEST_BROKER_LOCATION", "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py", "Machine") diff --git a/coin/provisioning/common/windows/vulkansdk.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1 new file mode 100644 index 00000000..bade33ef --- /dev/null +++ b/coin/provisioning/common/windows/vulkansdk.ps1 @@ -0,0 +1,48 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will install Vulkan SDK + +$version = "1.0.51.0" +$url_cache = "\\ci-files01-hki.ci.local\provisioning\windows\VulkanSDK-" +$version+ "-Installer.exe" +$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe" + +Copy-Item $url_cache $vulkanPackage +cmd /c "$vulkanPackage /S" + +echo "Cleaning $vulkanPackage.." +Remove-Item -Recurse -Force "$vulkanPackage" + +echo "Vulkan SDK = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1 new file mode 100644 index 00000000..f433ac7a --- /dev/null +++ b/coin/provisioning/common/windows/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/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..04c09770 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/22-mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/usr/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/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 60f5ad29..23b80d89 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -83,6 +83,9 @@ installPackages+=(perl-Digest-SHA) installPackages+=(glibc.i686) # Enable Qt Bluetooth installPackages+=(bluez-libs-devel) +# QtWebKit +installPackages+=(libxml2-devel) +installPackages+=(libxslt-devel) sudo yum -y update sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..04c09770 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/22-mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/usr/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/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh index ddb1d3dc..fbd75f22 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh @@ -41,11 +41,11 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." -versionARM="2.2.2" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-2c947f7.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package" -SHA1="2583ae29951954cb27f12400fcb4ee94738d1430" +versionARM="2.3.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-41b0b46.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" +SHA1="f17cce550c9d2148f11ae5c760f43a67e9813a45" yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" yoctoLocationARMv7="/opt/yocto-armv7" sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" @@ -59,11 +59,11 @@ rm -rf "$yoctoInstaller" echo "Installing Yocto toolchain for 64-bit b2qt..." -versionARM64="2.2.2" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-2c947f7.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/morty/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/morty/$package" -SHA1="512b5bc1ad62af88d021eb511eeac4648d661fc6" +versionARM64="2.3.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-41b0b46.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/pyro/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/pyro/$package" +SHA1="b49d7ec8a6339dda5a82815dc31fed1fae00851d" yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" yoctoLocationARM64="/opt/yocto-arm64" sysrootARM64="sysroots/aarch64-poky-linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..04c09770 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/22-mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/usr/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/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh new file mode 100755 index 00000000..3ccb412d --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/42-freeopcua.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 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$ +## +############################################################################# + +sudo apt-get update +sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev + +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR +git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua +cd freeopcua +git checkout ca75e05a8e63d88dbfc259e1251f405106411b66 +mkdir build +cd build +source ~/.profile +cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. +make +sudo make install diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh index 0661fdb0..cbdcbf64 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh @@ -3,9 +3,12 @@ set -ex sudo zypper -nq install git -# default compiler, gcc 4.8.5 -sudo zypper -nq install gcc -sudo zypper -nq install gcc-c++ +sudo zypper -nq install gcc7 +sudo zypper -nq install gcc7-c++ +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-7 \ + --slave /usr/bin/cc cc /usr/bin/gcc-7 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-7 sudo zypper -nq install bison sudo zypper -nq install flex @@ -17,6 +20,7 @@ sudo zypper -nq install glib2-devel sudo zypper -nq install libopenssl-devel sudo zypper -nq install freetype2-devel sudo zypper -nq install fontconfig-devel +sudo zypper -nq install sqlite3-devel # EGL support sudo zypper -nq install Mesa-libEGL-devel @@ -48,5 +52,13 @@ sudo zypper -nq install libXtst-devel sudo zypper -nq install mozilla-nspr-devel sudo zypper -nq install mozilla-nss-devel +# qtwebkit +sudo zypper -nq install libxml2-devel +sudo zypper -nq install libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia) +sudo zypper -nq install gstreamer-devel +sudo zypper -nq install gstreamer-plugins-base-devel + # cups sudo zypper -nq install cups-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index 92a8dd0b..e7cdd4a7 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -9,4 +9,4 @@ sudo pkcon -y refresh sudo pkcon -y install python-devel python-virtualenv # install python3 -sudo pkcon -y install python3 python3-pip python3-devel python3-virtualenv +sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip python3-devel python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..04c09770 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/22-mqtt_broker.sh @@ -0,0 +1,36 @@ +#!/usr/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/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh index 8461c656..8461c656 100644..100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh diff --git a/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 new file mode 100644 index 00000000..54a3d563 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 new file mode 100644 index 00000000..71deb0d4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 new file mode 100644 index 00000000..078f862e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/23-winrtrunner.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\winrtrunner.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 new file mode 100644 index 00000000..54a3d563 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 new file mode 100644 index 00000000..71deb0d4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 new file mode 100644 index 00000000..078f862e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/23-winrtrunner.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\winrtrunner.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 new file mode 100644 index 00000000..71deb0d4 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 new file mode 100644 index 00000000..71deb0d4 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/qt3d b/qt3d -Subproject 387dde19d2cfc349d8fe9b5775078798d99fc14 +Subproject b2b7616786af7041f9d1db15511df48c68847ad diff --git a/qtactiveqt b/qtactiveqt -Subproject 15c9ffc20f205e32b9297249be944bcbedd84fc +Subproject 50578d3893c611b3a33bbd8239a126f2b8f234b diff --git a/qtandroidextras b/qtandroidextras -Subproject cd6fc729f32ed01ec52b7aad4be463c8161240b +Subproject 5794f3130cb1894ea3d8143c2c89de23886d9c1 diff --git a/qtbase b/qtbase -Subproject 957c1d9abd854a3b5c43ace807ab7cbf89c9149 +Subproject 0ffc39806e4669eaebe2d20d197b3a6f356be86 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject e8c0f4eb3e3ffebad02eee7b6bfecf0a3c573f1 +Subproject b742b8f1b654bd185244973f7bae60da951d41a diff --git a/qtcharts b/qtcharts -Subproject a2eb6b3b15e19d5c8215c41694ce8c74918cb58 +Subproject 175d864fbb96ed64cc609fe08df4b2866836804 diff --git a/qtconnectivity b/qtconnectivity -Subproject 8cece5f6e09010de4bebd1a2ef524e2ca55d8a5 +Subproject b274a83bf4f44d0e2642a8e3bd6bada4ccdbf83 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 172dbad2db094148323fd8a9e6ab44c72a9fa88 +Subproject c6a8bae2563bf883b483c5bfa8b2caf15a1fb33 diff --git a/qtdeclarative b/qtdeclarative -Subproject 706a6647db695cdeb854ef1bf956ded56b498f7 +Subproject 1b96186d1418adcba85fdbfd794da2d2f6ea122 diff --git a/qtdoc b/qtdoc -Subproject efb7c673cda85f7de1941e4fbf8e6cc4ad290a2 +Subproject ea25c59aa9e6d7ef69ba6e06a1509042b4af0d5 diff --git a/qtgamepad b/qtgamepad -Subproject d252eb8ae4f99a5ad193662a493aa17044aef43 +Subproject 544d3e4f6f42771b38cafd8a200b16299f2d102 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject ddee9ff8217d307b962c033ea632bfe3ef683ac +Subproject 66031e932c321ccb936e254b5d1810fa633c6cb diff --git a/qtimageformats b/qtimageformats -Subproject 3c607b324ffbf84ce9803d80a04c7d663e84749 +Subproject 54cdb5b07b2ae2130ce73c6bb22c65b4ad1cba0 diff --git a/qtlocation b/qtlocation -Subproject 765ec408b3b355b37c04f52dc6c477e3dca3e3f +Subproject 9283a290040fd55f7eb34580b99f771d4facdeb diff --git a/qtmacextras b/qtmacextras -Subproject 5e0178d350c3f59fe327b5a5c89beb4f48efca2 +Subproject c190b14ae3ce5ffd2701b457ec8da1b32820be7 diff --git a/qtmultimedia b/qtmultimedia -Subproject 7638848d2486e2fac9764b60a99de08f50adc8e +Subproject 2e9d1fa5ef1367e5d2ace88bc47f93b8fe8a039 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject eee494c12a70fa0aa6fce427f47f44ff60281dc +Subproject 8f4f2e0cae642ff5eb0b87ae1d4e9c5e6ccf2bd diff --git a/qtpurchasing b/qtpurchasing -Subproject 3479671699f5a6cb13e002762dc35398b66066f +Subproject 49c5461af0888950b80eb9558647ccd764d5573 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 38414f9262aebe9e77dcb181a1672d2e929fbb4 +Subproject 314d1bdf7d56462102639e12d34596cbfd4fce9 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject d64774add9fafa24406a202d0313e10780e1e71 +Subproject 26056b52b182b4452855f54a2c811d64246c434 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 286f3c626087635cb24708b8e42b1d8af040164 +Subproject c26dd694e8374b478bf428bc9e8753cfc0c3a52 diff --git a/qtscript b/qtscript -Subproject 8399cdfbaf2aceab9c22fdcb10d2369ddb39b5d +Subproject 86317d8799cba34ad682a1709cf46a5eee815c8 diff --git a/qtscxml b/qtscxml -Subproject 86983e533aec1cf1095fec643dc6b1b9029fd45 +Subproject be2cb77f0c882444d4d1080953b4d1b961973c0 diff --git a/qtsensors b/qtsensors -Subproject 01186d63a0e585d6eb432271371dd3cd489dc90 +Subproject a5881f10e0ba6ba283b1215a534205619666141 diff --git a/qtserialbus b/qtserialbus -Subproject 81b1ae518792a9c1a2417c3a05b87eb5dc7ebc1 +Subproject b65de45fbfa08d0d2d5b89df77181d372659809 diff --git a/qtserialport b/qtserialport -Subproject c0bdb69f432117e9119866bd610aea87d3eb4ee +Subproject 7c827dcbf82d5e5bfbba4053a32c54413a95182 diff --git a/qtspeech b/qtspeech -Subproject 16ab9c262b1d53222913da96f7a14485e3ef083 +Subproject f5aaee80166be7969a71496d2fd9a8152d8effb diff --git a/qtsvg b/qtsvg -Subproject 74eb2d7d0268492c95779cb6029393aa1de67e0 +Subproject 275bd8a4a76256e889cad1ea88c4b5d3acb9ad8 diff --git a/qttools b/qttools -Subproject 47689d484a6254c2eef3ee382ea5e2775a020c0 +Subproject 3c7675d9609a15bea81884560920bded736f79a diff --git a/qttranslations b/qttranslations -Subproject b3684346bd60983cecf2524f9f8081df514b5cb +Subproject f54b179a16a2301bac828a97a86b1a3719619d1 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject e078c5e237142270f5d85a22a1e8adc96966869 +Subproject 1a9158bfbdd8dd01bac591c11bb0d0bf46514dd diff --git a/qtwayland b/qtwayland -Subproject 6793a0a907f3aa92f8f8bd5448505c152d0e3a3 +Subproject 06230d22488796d92ea130e985d1e0ee2ed0519 diff --git a/qtwebchannel b/qtwebchannel -Subproject 97d2deb55b854fd2b97efc0a5b41da28444c6e7 +Subproject a2b88f9ba0ce2e03ffa73ba26e910e988db5d6c diff --git a/qtwebengine b/qtwebengine -Subproject 04337275e4b66ba5853c24a79d7f61ebb2e7a24 +Subproject 414f57b955a6e5cfe9315e9a443f4b3e4a36f89 diff --git a/qtwebglplugin b/qtwebglplugin new file mode 160000 +Subproject 235150a1909b9d666acbdb541c665a19cc474c0 diff --git a/qtwebsockets b/qtwebsockets -Subproject 78607d656e18717e2edb5e0430e7eeefaf24fa8 +Subproject f8665a7cf5e18e5e40ad3e50039ba0362c5d2ec diff --git a/qtwebview b/qtwebview -Subproject f016c7781fb418fd57bae62d22ce46f8711de62 +Subproject eef3467cfad9f6ad892344bfcadbd59b5bcb4f5 diff --git a/qtwinextras b/qtwinextras -Subproject d4985a348ccb2e3b83d64dbc95f5f2bab83e9bc +Subproject a346f1d1cdc997948d1fc84ca65031463f1b86a diff --git a/qtx11extras b/qtx11extras -Subproject 922a92b533edc9bbefee729a8d91b28fbe0e394 +Subproject fcd1d9a09d22619dfae4c1d4f9911e9acce2e89 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject c3ef9c68cefc4fd323e34f1dcf0314d385a70e2 +Subproject 0a84ad44ff5b793316485fd992326627a70fda8 |