diff options
65 files changed, 497 insertions, 53 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/qt5.txt b/coin/platform_configs/qt5.txt index 5282634a..15c0a761 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/mqtt_broker.ps1 b/coin/provisioning/common/mqtt_broker.ps1 new file mode 100644 index 00000000..610f22d8 --- /dev/null +++ b/coin/provisioning/common/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/mqtt_broker.sh b/coin/provisioning/common/mqtt_broker.sh new file mode 100644 index 00000000..b52b78b1 --- /dev/null +++ b/coin/provisioning/common/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=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/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/vulkansdk.ps1 b/coin/provisioning/common/vulkansdk.ps1 new file mode 100644 index 00000000..c572fa47 --- /dev/null +++ b/coin/provisioning/common/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\..\common\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/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/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/mqtt_broker.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/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh new file mode 100755 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.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/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/mqtt_broker.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/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-15.04-x86_64/mqtt_broker.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/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh index 050f4aba..ad4e25a9 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh @@ -41,11 +41,11 @@ source "${BASH_SOURCE%/*}/../common/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/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh new file mode 100644 index 00000000..4f4fd6ea --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh @@ -0,0 +1,49 @@ +#!/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 +cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. +make +sudo make install diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/mqtt_broker.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/mqtt_broker.sh" 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 ce0badc0..a30a3fb4 100644 --- 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 @@ -5,4 +5,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/mqtt_broker.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/mqtt_broker.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/mqtt_broker.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..38185051 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" 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/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 new file mode 100644 index 00000000..38185051 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" 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/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 new file mode 100644 index 00000000..df466d52 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mqtt_broker.ps1" diff --git a/qt3d b/qt3d -Subproject 37d78994de56cd11a06ccd1a777cf0ac8ec8e80 +Subproject 8470becd886d299c1be892d8113dfff21603561 diff --git a/qtactiveqt b/qtactiveqt -Subproject 451ca492ea5f71045597f26db54c840addb6d6a +Subproject 3f1310a3193a36315dcf0b093451103ad046e1e diff --git a/qtandroidextras b/qtandroidextras -Subproject cb2fa645bef1a0c05065fe43a038e5bf962e095 +Subproject be7089148192ec8e80ea50665ec2df421cf0c4c diff --git a/qtbase b/qtbase -Subproject 782eb1a114c0aaa729925899b2061d47f494435 +Subproject 812bb236dd1622896b6a0ca9bbe1334a69855aa diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 25f6b209a64a3c7e16e1c4655a970aaf5f4341c +Subproject f4d043c71f1f14868b130e46a1a844ee7cdfe50 diff --git a/qtcharts b/qtcharts -Subproject ad9d59e871b6f1a7b3f0b0ae1248ffa20564799 +Subproject a58dfcb2460a2dd4db83a33bb5349e94303e627 diff --git a/qtconnectivity b/qtconnectivity -Subproject e46cde935ee76eaa00e78af968121502e240634 +Subproject cf0df8be7f4cc809672f98507c1723015a0741b diff --git a/qtdatavis3d b/qtdatavis3d -Subproject de346171018b353d2abcfb589e644480c2aa6fd +Subproject cf4bf696641dbcd142f2e0e7057d7cb70b6722e diff --git a/qtdeclarative b/qtdeclarative -Subproject ae01e0dbf50cb6da1967e10eb95d63313dc5aa7 +Subproject 8283bc83857ed8c7d85b61d2dc3b35fa4e96a03 diff --git a/qtdoc b/qtdoc -Subproject b8556f01d711389d94cc1ccb864324b24c0e7de +Subproject 21c0ac79d94bbf9c999de45cff8086ca94de6d0 diff --git a/qtgamepad b/qtgamepad -Subproject 7eaac052282038dc9a05afe7b48fa4676f6876b +Subproject f2983c524d1a3f350b48265a033fd9a3f69c0d7 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 9b6d754d192ae53306b8fe6277b0bbe84bde53d +Subproject df1c9dbad75010fc967f4a236393fa1de36110f diff --git a/qtimageformats b/qtimageformats -Subproject 4a5d500d6da8c7af2d3abfcf759586d5756efa7 +Subproject 167e7d191b3751a061842e332036dd6989d68a2 diff --git a/qtlocation b/qtlocation -Subproject 730b2bd96e88fe63364c9f81e299555f0b1f0da +Subproject b2e0a242a8c77d8cff186ef25b8360927c95594 diff --git a/qtmacextras b/qtmacextras -Subproject 26ce599c8ffdae9b001ec9dc7d5639ff0b52806 +Subproject 2bc33d6e70fcf16aedeead643ab1c39ca090615 diff --git a/qtmultimedia b/qtmultimedia -Subproject 10998733af8a3d54b795ee57a8df9a1b3e776aa +Subproject 10304528c20fb9a385c617a38b6be35d1b18598 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject eee494c12a70fa0aa6fce427f47f44ff60281dc +Subproject bebf6f4816c8025b592c260577dbf09fc0f4ed7 diff --git a/qtpurchasing b/qtpurchasing -Subproject acdce9431b5ead5754e149853839569ffbd9e20 +Subproject 4b87fcdf70d14b288e4859156403c3d2886020f diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 37592ad9c6df35bdd37609569963fe7361cdad8 +Subproject 5bc4310529a8ae5cfc18afda1a1b788691448d6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject d9e740d2ccf8c1d3caacfcd95537718048e3a7b +Subproject eb7551d5d5e5155606e21158ead1541546bc214 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 170aa77ff7a38ba2ddbc68f75c1ac38a47af87e +Subproject e6eb6ab12daf76f3e716c0d51ceecdab61e39e4 diff --git a/qtscript b/qtscript -Subproject c904f06f716585edd94dbd1b4271dcbf305c268 +Subproject 0bb3f3017f72cbf8d6866b8baa1820ab3dd8931 diff --git a/qtscxml b/qtscxml -Subproject 866816d57204dc60bb9d0a8b5157c4cf7addd21 +Subproject 81b0d78673f5a632e3891d048be9a08fe48351d diff --git a/qtsensors b/qtsensors -Subproject e2a5bf08c4d9239ff1da88b4d35e9bb89133a94 +Subproject af1372a4e69d5a7664142df06b0b96d7cd19734 diff --git a/qtserialbus b/qtserialbus -Subproject 50aea4ada4521f009ea8524b91daea1fac283c4 +Subproject e13737e5de8d3a2653e97de365412c28bd6c612 diff --git a/qtserialport b/qtserialport -Subproject 5fdcd2f60021771d301743f51852db05ea45cdf +Subproject 98454fbc2a687a6440ae5e61070ebd6073e8016 diff --git a/qtspeech b/qtspeech -Subproject 53afd0808aeae53bf1ad94647be936cce00ef9a +Subproject 345d43ec7f349a2b71de784216d0a6fd6c42a0d diff --git a/qtsvg b/qtsvg -Subproject 808ae3589a031413e25d7b6e66f2e966cefacb9 +Subproject 984ba6977201f8fbd94d44a2b67519e1faf458c diff --git a/qttools b/qttools -Subproject 796a5e005fa1ae2bfe6f9278fc482723eb89f42 +Subproject 84e40c5f4d78a6d4a0ae1d87323a20ed96f319d diff --git a/qttranslations b/qttranslations -Subproject 6987cf9681dfb6c212a3225a8669499d3dfe187 +Subproject c30c9e0ae178cf3d3f20c058097d8f596f8df88 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 6ecb881bdc73a4ab1f4485e14bb87c18aac771c +Subproject 685ae5ca057d37ec2ca909fb08b5610b1829edc diff --git a/qtwayland b/qtwayland -Subproject 6bd70687aa32d1ad6fedc7cfad499fdaf037193 +Subproject 61f92b6742c96f4974e23893ba6926e4d012cd0 diff --git a/qtwebchannel b/qtwebchannel -Subproject 44a2c0006546ba39a4a523904f75a9cb01cfe5f +Subproject 5e43b6364b6c0bbeb67772581e550fc3e64e900 diff --git a/qtwebengine b/qtwebengine -Subproject 260e9dd9b98c2bc90229f7d2f7aba8cc0029d24 +Subproject 6921ebd6d8bc8bb62d9118c7a1a750f2fd78789 diff --git a/qtwebglplugin b/qtwebglplugin new file mode 160000 +Subproject f73929c2c6c9229f71470502faab14178d56115 diff --git a/qtwebsockets b/qtwebsockets -Subproject bd08a6ba75ed04089fb2fa3e763ade8ebc1ef9d +Subproject 30e3ccc84031e5530ee38ab4a79026755706720 diff --git a/qtwebview b/qtwebview -Subproject 17e076b56e40e25248f156830b293fee6421ecf +Subproject f0a48620d5d647ea1e2153a522a948f5b0fedc1 diff --git a/qtwinextras b/qtwinextras -Subproject 130426337da1703ed3c0d9d84f4ccbd96c56133 +Subproject 8be91fab769e1d55a3146acb04102df67968efd diff --git a/qtx11extras b/qtx11extras -Subproject aee4dc63f6d43cf775c063b76d789ac6d4a8f51 +Subproject 8e4810cf73a4294eacafede22f93f4bda8dab1b diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject f5f2b1f5fc29968b13b464cc9a6b2df6eebe75c +Subproject 3cd6679d8702fef3f0d3614724375577945fcf0 |