diff options
46 files changed, 136 insertions, 40 deletions
diff --git a/.gitmodules b/.gitmodules index 4cc5b93a..7144b246 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.10 + branch = dev status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.10 + branch = dev status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.10 + branch = dev status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.10 + branch = dev status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.10 + branch = dev status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.10 + branch = dev status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.10 + branch = dev status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.10 + branch = dev status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.10 + branch = dev status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.10 + branch = dev status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.10 + branch = dev status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.10 + branch = dev status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.10 + branch = dev status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.10 + branch = dev status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.10 + branch = dev status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.10 + branch = dev status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.10 + branch = dev status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.10 + branch = dev status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.10 + branch = dev status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.10 + branch = dev status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.10 + branch = dev status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,109 +211,115 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.10 + branch = dev status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.10 + branch = dev status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.10 + branch = dev status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.10 + branch = dev status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.10 + branch = dev status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.10 + branch = dev status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.10 + branch = dev status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.10 + branch = dev status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.10 + branch = dev status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.10 + branch = dev status = addon [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.10 + branch = dev status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.10 + branch = dev status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.10 + branch = dev + status = preview +[submodule "qtopcua"] + depends = qtbase + path = qtopcua + url = ../qtopcua.git + branch = dev status = preview diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 23858e68..4b7465ef 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -19,6 +19,7 @@ qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packagin 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-macos-10.12-x86_64-8 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh new file mode 100755 index 00000000..abbda212 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-libclang.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +. $BASEDIR/../common/sw_versions.txt +VERSION=$libclang_version +URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" +SHA1="bbdbbc0296f42310077539b7247d285386119ef4" + +$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh index 4f4fd6ea..c23833dd 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh @@ -47,3 +47,4 @@ cd build cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. make sudo make install +sudo /sbin/ldconfig diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/040-qnx700.sh b/coin/provisioning/qtci-macos-10.12-x86_64/040-qnx700.sh new file mode 100755 index 00000000..a039654a --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/040-qnx700.sh @@ -0,0 +1,79 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs QNX 7. + +# shellcheck source=../common/try_catch.sh +source "${BASH_SOURCE%/*}/../common/try_catch.sh" + +targetFolder="/opt/" +sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip" +folderName="qnx700" + +ExceptionExtract=100 +ExceptionExtract2=101 + + +try +( + sudo mkdir -p "$targetFolder" + + echo "Extracting QNX 7" + sudo unzip -q "$sourceFile" -d "$targetFolder" || throw $ExceptionExtract + + sudo chown -R qt:wheel "$targetFolder"/"$folderName" + + # Verify that we have last file in zip + if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then + throw $ExceptionExtract2 + fi + + # Set env variables + echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc + echo "QNX SDP = 7.0.0" >> ~/versions.txt +) +catch || { + case $ex_code in + $ExceptionExtract) + echo "Failed to unzip QNX 7." + exit 1; + ;; + $ExceptionExtract2) + echo "The last file in the zip did not get extracted." + exit 1; + ;; + esac +} + diff --git a/qt3d b/qt3d -Subproject d4fb24c0871320667640f100b743f34f702db6c +Subproject ba5bc93b95d28a28a72e60281f765a6f031129a diff --git a/qtactiveqt b/qtactiveqt -Subproject f263d206341472e23e0e1ad536faa1b0a22286c +Subproject def6c3c3e263d06a39b2370a122f080f24df26f diff --git a/qtandroidextras b/qtandroidextras -Subproject b5f423f50a67d7e1ff416e4348517332d46f780 +Subproject 4d5368ab4fddee4439c808be2b4d56f5fd2dd27 diff --git a/qtbase b/qtbase -Subproject 5b4cf7af6a492b6ef5b7c718b346b38ddad4c99 +Subproject ee84db4c18562c5dfeb1e7cf2d9fb1fcd4490df diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 3b24ef25fa328bf993891e242c0c3ff677fafbc +Subproject 7de71897132cc771f6177a75fdb3c76ce82659d diff --git a/qtcharts b/qtcharts -Subproject cd8716678cf0cf2c9678edf4531a76cc00c7f82 +Subproject 2a74ffa1721d512f1c22a3d33af0ddbbdf953a9 diff --git a/qtconnectivity b/qtconnectivity -Subproject 18af3226765b62312acc8f801cc531fde0d9822 +Subproject 844382001f8deaa7fcc9faac779b24188f35329 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject c54adde27f5aa723882ffc5f77fae86b3793b6e +Subproject 3a965b26e38d551cac80a0e9ba1ffb4bf082a6d diff --git a/qtdeclarative b/qtdeclarative -Subproject 0d3592aa7fab8bf4d8f80bc3b35323efe6950b1 +Subproject d8b0ad35065e7edc10140bd28f5485dd3a162ab diff --git a/qtdoc b/qtdoc -Subproject 59cd20b07364bc1c08217a6d669cb09fa827d09 +Subproject 035ae612b563b09af83ee7bbf7249976f97b472 diff --git a/qtgamepad b/qtgamepad -Subproject ffa5a03da503c3cd00f960debf3f43b85958c87 +Subproject e673d453e7431dc9af5be7394c3cc3cd9da3a9f diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 045174c411f89863165610c1f6135ef4bd3d088 +Subproject bfaeb74ef570c7d95ce4a14e23923256efe824c diff --git a/qtimageformats b/qtimageformats -Subproject 36fdeb50941e3e2b0c4cd1b3343c3e337534357 +Subproject b0631ce6ed816e16869b87165ce8d7e34643afe diff --git a/qtlocation b/qtlocation -Subproject a0c7b93df620d9254aef3136da08adbc7075283 +Subproject 8c6338ab979ed2571971cc761dafb1791a65353 diff --git a/qtmacextras b/qtmacextras -Subproject c6d2605b07547a10c3400074307a2cdfb7be516 +Subproject 50544536b0c720e777b41fae5808dd965f2c5b4 diff --git a/qtmultimedia b/qtmultimedia -Subproject 41ef172d1cee40c42d14ff7824baedf11060b98 +Subproject acc49e582abf76c962851f53cbd66134812f6a1 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject c9893adea875610d5e325934ad9681bc8ca1717 +Subproject 63500da51105c8cf9a8751ac94783cf1a251283 diff --git a/qtopcua b/qtopcua new file mode 160000 +Subproject 6091b25b4ee329402fa693c019918e966757f0e diff --git a/qtpurchasing b/qtpurchasing -Subproject 3b4079f9c20e1c33b565b90fc51c05667ebdf42 +Subproject d7cd9c736d2acca98d64ff55c9caccefbb7185b diff --git a/qtquickcontrols b/qtquickcontrols -Subproject c0dbf5da64e6fc20d6edc59cc849e282e9bfea5 +Subproject a530bf57935406c5268abffb29b437cb63d0432 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 0bd5c342013bfae63f1a7e13a0f531cb0a2c858 +Subproject eb1b76053f2c6f35f8a33bec71536ca24651a71 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 5e3c8093fe596f1911ae692a743a93c9e96f0ae +Subproject c2088ca4814ef3719e3b2ff46d66f383f52d6a0 diff --git a/qtscript b/qtscript -Subproject 3d44bf7ce2a45d461f1d74a3f1dbdff31384589 +Subproject cd7d2dc5481f7954da7ebec27b86adda2602c5b diff --git a/qtscxml b/qtscxml -Subproject 3ba4176568867cb146c2b758cd39461367ad22d +Subproject c5c6aba3b07a44726da96cd2acaed05e67fe3ff diff --git a/qtsensors b/qtsensors -Subproject b2e6b77c0862aba5d9f9fc979db8f2d84e47a78 +Subproject 203c9707194f167a70cb27ea47dbb6d7bb3e7d0 diff --git a/qtserialbus b/qtserialbus -Subproject 01df1b7a635b11c9d0985f9651cfa4ae3d03789 +Subproject 4868e506f8498f0edad2db80c6180172147d17a diff --git a/qtserialport b/qtserialport -Subproject 671233ea2b2f2903b153726f4d6358fb5673d27 +Subproject baa87d4c34059b790c93d210f07696de818e8d5 diff --git a/qtspeech b/qtspeech -Subproject cb10801ee7ea27d2296767ee24cbb048a7db544 +Subproject 027166a14684a60e037f39ce5205bb4908610f2 diff --git a/qtsvg b/qtsvg -Subproject dc9e39eb679946e82bf3b1a82f5c49737f9994b +Subproject 4dd6b2bfebf02223ef498bf52ce354c628cc960 diff --git a/qttools b/qttools -Subproject de6b61fd34e7e316607a1904605e895ca27bbcb +Subproject 4c5927c40b7c3d94308d5c20a0c79acbd9e4f10 diff --git a/qttranslations b/qttranslations -Subproject 4f744d427a5bfd698dcdad394666a72ccbb79a3 +Subproject e65c3e30bc56242bee353d4d28f9cf97c9af8a3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 27df0d34644ffc553972641abfd3406219c8539 +Subproject 11f867f0d1d8758852579756f506f04b2e00ae5 diff --git a/qtwayland b/qtwayland -Subproject 04f6ff77ef0c8858629766e191ecc3d4ef05684 +Subproject 8bf81ea54f02f39ad1716567ee98102a2580a78 diff --git a/qtwebchannel b/qtwebchannel -Subproject ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25 +Subproject c0900bdd63601fab2ae0df80a7d6c5a0d53355f diff --git a/qtwebengine b/qtwebengine -Subproject cf06b687845b6e37ef3cd80fd644bb7d769f003 +Subproject 3be9a0591f2cf0dac2efa79ea3f2a606afebb5b diff --git a/qtwebglplugin b/qtwebglplugin -Subproject 5b884ad0a48358bc50e05b8baa9821161b34543 +Subproject d1c638696a641140f67299dd2f8ecac4dec4349 diff --git a/qtwebsockets b/qtwebsockets -Subproject 71b5fc5dd10e9edce8db886f6c05b7950b3cca6 +Subproject 75042d31d1d267d0a4091932c95579747a102e9 diff --git a/qtwebview b/qtwebview -Subproject 7e71daf48c2ee3c3518cbfe6103d212772ccf41 +Subproject a379e86fe5e37f3cac77ae135df2ffb5c7f9ae3 diff --git a/qtwinextras b/qtwinextras -Subproject a56d14f97c4b5aac1ab1cd3e95ce763452ea3e3 +Subproject 07f6d25a00af112d46e939992fb9cf42879fc7c diff --git a/qtx11extras b/qtx11extras -Subproject ec2c0f4db6350a304dcf901b9adbadc895864c1 +Subproject 5e9053c3232e814a0e1cdbb115e00066107be1b diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 9e26cfa167778f3d9444aedcb23c8476683b378 +Subproject 34cd2d63fc3ce594887f5245896c795ffb8596b |