diff options
66 files changed, 489 insertions, 47 deletions
diff --git a/.gitmodules b/.gitmodules index b4988927..4cc5b93a 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,109 @@ 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 acfeba93..9150d782 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -18,6 +18,6 @@ qtci-osx-10.10-x86_64 Clang qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests qtci-osx-10.10-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.2-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC Release +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index d486061d..fba05914 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-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 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/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 2a9d9ac7..aa718d0c 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/coin/platform_configs/qtdeclarative.txt @@ -1,3 +1,3 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Morty armv7 GCC DeveloperBuild +qtci-linux-Ubuntu-16.04-x86_64-1 Boot2Qt_Pyro armv7 GCC DeveloperBuild 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.2-x86_64/mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/mqtt_broker.sh new file mode 100644 index 00000000..e367c20b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-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/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 254b738d..0b42d5a1 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-virtualenv +sudo pkcon -y install libpython3_4m1_0 python3-base python3 python3-pip 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 ba9a38ceca15f9bc086a6c9c5d341001e9e7385 +Subproject e67119b71d1b63c5710100349fa634113e93ada diff --git a/qtactiveqt b/qtactiveqt -Subproject e3753542d00aaed7b9890064e7d7923d3b3bc9e +Subproject f263d206341472e23e0e1ad536faa1b0a22286c diff --git a/qtandroidextras b/qtandroidextras -Subproject 9f70e4b12b7eaac3f6f727f6d3189779794342f +Subproject b5f423f50a67d7e1ff416e4348517332d46f780 diff --git a/qtbase b/qtbase -Subproject b0ffb332f2aa2ffc0b752c2ad740fbb6a69e016 +Subproject 0d0ad598c54652dbe04d5716025facd83adc979 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject f19f1de5124465f001181b494d788b6a6084157 +Subproject 5be124d7373c36daf9a6c01712e6eab057bbf56 diff --git a/qtcharts b/qtcharts -Subproject f2aaf5f3b528f954c4ff7b3e6a79acae157cec5 +Subproject cd8716678cf0cf2c9678edf4531a76cc00c7f82 diff --git a/qtconnectivity b/qtconnectivity -Subproject ae21b2574c0000aac6e3b10f7e11ebd1da567ff +Subproject ed5a1134d50f6dbed3fc568c799a39f4e233805 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 82f9c8a5a246845c746f0a8b3497dceba19ff05 +Subproject c54adde27f5aa723882ffc5f77fae86b3793b6e diff --git a/qtdeclarative b/qtdeclarative -Subproject f17b826a72d77379288aa84a933b9231c279cba +Subproject 112d668c0fded8c6ab7bf40fd3800cf43e005f9 diff --git a/qtdoc b/qtdoc -Subproject 3d3899a36e261c99913830e879d15ac8996de60 +Subproject 813796be66919095c5abea126e50d2c454a7593 diff --git a/qtgamepad b/qtgamepad -Subproject 1fc40deed6993265c436783cc367285bf9a2266 +Subproject ffa5a03da503c3cd00f960debf3f43b85958c87 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 8c4488a77d5fe4fed26b22dbc91b746a77cd056 +Subproject 045174c411f89863165610c1f6135ef4bd3d088 diff --git a/qtimageformats b/qtimageformats -Subproject 0d42a2e44491980e6803d6aee6c7d2e83acadec +Subproject 36fdeb50941e3e2b0c4cd1b3343c3e337534357 diff --git a/qtlocation b/qtlocation -Subproject 6ba14c6d2a6b7eb325cd975393306c4fe6809ac +Subproject a0c7b93df620d9254aef3136da08adbc7075283 diff --git a/qtmacextras b/qtmacextras -Subproject ceb065d40dc9032dc27189393de9561b575b29f +Subproject c6d2605b07547a10c3400074307a2cdfb7be516 diff --git a/qtmultimedia b/qtmultimedia -Subproject f6838120ead0361463c800c25a711b799fae29e +Subproject 230f070c7ed353605260f9fa79d0a5bc5181321 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 47b80ecae6fe0b9a2c74f0b0feb243145695995 +Subproject 4e681472f6e25153745151f2b41a8ebf4bc94f5 diff --git a/qtpurchasing b/qtpurchasing -Subproject 9c87f11f6d7ae46150b540cf2eee14e8217bb85 +Subproject 3b4079f9c20e1c33b565b90fc51c05667ebdf42 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 33c5f4c3ad73fa2e75fe7ba69f5359e69adb212 +Subproject c7a43a5d3d34ff0d7f1f8d88750643ffa8195ef diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 391cba9a1e7fc6b2c8a26e4fbcab90a2bf670e7 +Subproject bf1df7beae8e3ebd2c0b529265bad52703fe8ac diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 6e0341bc878ff82d3c1039dcce09f9226954618 +Subproject f73c78ed109473234a2a3725715d1ab22c95fec diff --git a/qtscript b/qtscript -Subproject 08b74f4f30c304b80249a593a572808bc1892f6 +Subproject 3d44bf7ce2a45d461f1d74a3f1dbdff31384589 diff --git a/qtscxml b/qtscxml -Subproject 16956a965817311fbc9d80ffbee74eb5d9ea00e +Subproject 3ba4176568867cb146c2b758cd39461367ad22d diff --git a/qtsensors b/qtsensors -Subproject 41897abf76636a17d76fad7e1528d170b619e51 +Subproject b2e6b77c0862aba5d9f9fc979db8f2d84e47a78 diff --git a/qtserialbus b/qtserialbus -Subproject 9a720b4fcc1d743db1b04f7696a30e7850c7707 +Subproject f4ae73d430d9bf2bd6432e8e4a4e44d2bf5d806 diff --git a/qtserialport b/qtserialport -Subproject 2a8284543018943ab581202cf934c751a22db6c +Subproject 671233ea2b2f2903b153726f4d6358fb5673d27 diff --git a/qtspeech b/qtspeech -Subproject 5393b76f3780b0be33cc727458993223605e5ab +Subproject cb10801ee7ea27d2296767ee24cbb048a7db544 diff --git a/qtsvg b/qtsvg -Subproject bdcd7a97449502f92069d36196cc81064b1c02a +Subproject dc9e39eb679946e82bf3b1a82f5c49737f9994b diff --git a/qttools b/qttools -Subproject ad18484063a41328d0e72c75cda151128977e0d +Subproject 4cb8667d20ff9f4af1451c54560ea864630f49b diff --git a/qttranslations b/qttranslations -Subproject 325a90e07e9dce4e5c915549e6c31a86423dfdd +Subproject 4f744d427a5bfd698dcdad394666a72ccbb79a3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject f3683d17c364c4f84f1591dd60121041628f9a5 +Subproject 27df0d34644ffc553972641abfd3406219c8539 diff --git a/qtwayland b/qtwayland -Subproject d4f67d8414b8ddac8fb4bd3d70ae65e20a81864 +Subproject 20ebb685e0fef048e56ed19403575634ce4b343 diff --git a/qtwebchannel b/qtwebchannel -Subproject d84318e98aa3cbac11b4f95b3581e95aab96a34 +Subproject ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25 diff --git a/qtwebengine b/qtwebengine -Subproject 7f56ce273a90aaa2273d9438f16678716275d80 +Subproject 9d962bc9424c71a451d04741619c9597f3da801 diff --git a/qtwebglplugin b/qtwebglplugin new file mode 160000 +Subproject ad251346485ef995f6a4094cf6039f88d08b0cb diff --git a/qtwebsockets b/qtwebsockets -Subproject 0f32f4efc5a9a8b33369013c2ba6c27c78498cf +Subproject fdb6d8370f9ae8fa148124289317c108399853c diff --git a/qtwebview b/qtwebview -Subproject 01ff5c0d5f937577cfd2391a43af4180f2a484b +Subproject 7e71daf48c2ee3c3518cbfe6103d212772ccf41 diff --git a/qtwinextras b/qtwinextras -Subproject f1e26328e8f1abe9d87e369b0fe57954dfe68a8 +Subproject a56d14f97c4b5aac1ab1cd3e95ce763452ea3e3 diff --git a/qtx11extras b/qtx11extras -Subproject 90d5d612bc7b3450a7a9d5c37c2de1d150f9518 +Subproject ec2c0f4db6350a304dcf901b9adbadc895864c1 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 7b67fba8bb21b06d423b68911b227fd1db22b1b +Subproject f8a92101077943131b22011ae48b69687f51a7f |