diff options
| -rw-r--r-- | .gitmodules | 122 | ||||
| -rw-r--r-- | coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh | 49 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcanvas3d | 0 | ||||
| m--------- | qtcharts | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdatavis3d | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtenginio | 0 | ||||
| m--------- | qtgamepad | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtpurchasing | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtscxml | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialbus | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qtspeech | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtvirtualkeyboard | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwebview | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
43 files changed, 131 insertions, 40 deletions
diff --git a/.gitmodules b/.gitmodules index 743e2e8e..6c17f09f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.7 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.7 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.7 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.7 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.7 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,21 +96,21 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative path = qtsystems url = ../qtsystems.git - branch = dev + branch = 5.7 status = ignore [submodule "qtfeedback"] depends = qtdeclarative @@ -129,142 +129,184 @@ depends = qtdeclarative path = qtpim url = ../qtpim.git - branch = dev + branch = 5.7 status = ignore [submodule "qtconnectivity"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats + recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = 5.6 - status = preview + branch = 5.7 + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.7 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.7 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 - status = deprecated + branch = 5.7 + status = obsolete [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.7 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquickcontrols2"] - depends = qtquickcontrols + depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 - status = preview + branch = 5.7 + status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git + branch = 5.7 + status = addon +[submodule "qtcharts"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtcharts + url = ../qtcharts.git + branch = 5.7 + status = addon +[submodule "qtdatavis3d"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtdatavis3d + url = ../qtdatavis3d.git + branch = 5.7 + status = addon +[submodule "qtvirtualkeyboard"] + depends = qtbase qtdeclarative qtsvg + recommends = qtmultimedia qtquickcontrols + path = qtvirtualkeyboard + url = ../qtvirtualkeyboard.git + branch = 5.7 + status = addon +[submodule "qtgamepad"] + depends = qtbase + recommends = qtdeclarative + path = qtgamepad + url = ../qtgamepad + branch = 5.7 + status = preview +[submodule "qtscxml"] + depends = qtbase qtdeclarative + path = qtscxml + url = ../qtscxml + branch = 5.7 + status = preview +[submodule "qtspeech"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtspeech + url = ../qtspeech branch = dev status = ignore diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh new file mode 100644 index 00000000..b14e94a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.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 57b6993d39b6761af773fa4fa37c3fbd39c764f1 +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. +make +sudo make install diff --git a/qt3d b/qt3d -Subproject 38baf18df4c572ef36dc203ea9172f3e7b44e06 +Subproject faf56f50608f9391d2a73ed7c61bfdd9c2afab7 diff --git a/qtactiveqt b/qtactiveqt -Subproject a4b8485cd38a9c33cdcf1b97633fa65b7230643 +Subproject 73ee37bebbf724a3ec01b30212ed31002a68208 diff --git a/qtandroidextras b/qtandroidextras -Subproject c6671096efe8c07d55cbf32b892a24ceea8d5bd +Subproject 368b0bbf2b2854547cfafa7092361f09dd157fb diff --git a/qtbase b/qtbase -Subproject ce37467acf34edf1380f896a0942b616dc4cbea +Subproject e64b2234e829cc47872225debcf80d6c06db18f diff --git a/qtcanvas3d b/qtcanvas3d -Subproject ab58e494db8a6506dd254a6ce961743dc10c4bc +Subproject 32404e27101c5ec81b4ab965faf38263429bbc5 diff --git a/qtcharts b/qtcharts new file mode 160000 +Subproject 7bc9c012efbb987790742ee8905965344be55ea diff --git a/qtconnectivity b/qtconnectivity -Subproject 54c9cd9e28bc6f0a2fa5118cfdbe922d71db662 +Subproject caded2edf69e8a60897653ace1e10b72199c742 diff --git a/qtdatavis3d b/qtdatavis3d new file mode 160000 +Subproject 2f6074fde0ec050c77f881e0d2ce265fa93a0fc diff --git a/qtdeclarative b/qtdeclarative -Subproject 48492b2ee5d2f9ad178982f4c16e895b3083d8d +Subproject 531d00c1909527cb1bc28f17197267ccde408b0 diff --git a/qtdoc b/qtdoc -Subproject 0f77b33d55d2f0467de00640774b179f8fa3ef6 +Subproject 65397e8c9d7a30bd8a07bfa866ded1428532b84 diff --git a/qtenginio b/qtenginio -Subproject 65f5956b1cc00c58c964d43af16165e59a6f4e0 +Subproject 0f6e294fb8534f677a5ec75113679cfe24f559c diff --git a/qtgamepad b/qtgamepad new file mode 160000 +Subproject 84b87c222872eb6e49727d773177b7f5b86e9be diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 83a50c0801440324101ad8eff775380a43a564c +Subproject d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6 diff --git a/qtimageformats b/qtimageformats -Subproject bf5b49878d75d316f31225f76152e8381a3d5f0 +Subproject 68d9cfe5256c91510552c2b16d5efdb01e77ea5 diff --git a/qtlocation b/qtlocation -Subproject 5dcd3d8526c7b8c7ac59a743f82130008d254d1 +Subproject 761331ddc841809a4bdc6ca2f2b84c148cb9b19 diff --git a/qtmacextras b/qtmacextras -Subproject 5af27ed4ed16f823adf609e9790c864c55ed4ee +Subproject 509c7b7f7da2fd69444b7dba32f31db51ad40aa diff --git a/qtmultimedia b/qtmultimedia -Subproject 15951e672eaf38537c82043b0b9b14088facbd1 +Subproject 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac diff --git a/qtpurchasing b/qtpurchasing -Subproject b5c6c76fac771326064295368a53cbdaf2bf0f7 +Subproject 0afcd2efe2c33bbbd5d9b1edc47b0fcccb6ce8c diff --git a/qtquick1 b/qtquick1 -Subproject dbc9131ebb300e715d5ebd815dc3ef9aa77ebf5 +Subproject 26229cfa0b729313893af5674d604e8692dbb94 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb5 +Subproject c6713e212ef0b97c45d6466b73220567e94a05f diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 835c1c26ef220cf084a7f066df748182229a4fd +Subproject 8b2e819ab2246d01eb564a52aa08bdf1d55c02c diff --git a/qtscript b/qtscript -Subproject fc9407affb74bbfa9d396fef32f319b6baa8471 +Subproject b49bfdaad11be1de632f907d43485a7ac701ddc diff --git a/qtscxml b/qtscxml new file mode 160000 +Subproject bdbe7d947a65070b59ac24cf9f05247037863ef diff --git a/qtsensors b/qtsensors -Subproject 127ac0810f042999a13db18e68b43be9ab85e70 +Subproject f32489e379805c51b28ae5d471491a649283fd8 diff --git a/qtserialbus b/qtserialbus -Subproject b8d5c1f1dff57da6927470543e5d004c237846a +Subproject ad54496cce03077073660c5c440b0f45b7e4649 diff --git a/qtserialport b/qtserialport -Subproject 8a30a60a03af3979de8988209f8f77638713c30 +Subproject a11fa1dfd529948da961d3d292926a15f9b7005 diff --git a/qtspeech b/qtspeech new file mode 160000 +Subproject ca8768b90c07bff5804b1fbb704041a4472f65e diff --git a/qtsvg b/qtsvg -Subproject cf25ebcf482ada36f5b5e0bb983a01cf2ab42f4 +Subproject 612c3041475550837dee7149b9f5e9e4f55c17a diff --git a/qttools b/qttools -Subproject 38fc6ad3e789c69dd09b0c494ead107d6da1080 +Subproject 570f0f314cbe4603db34d4967b6a7dd35d174eb diff --git a/qttranslations b/qttranslations -Subproject efa6513bbf2515fbe6ab7b365e9597a8900ae27 +Subproject c95337f7e974c75a88b96c168b6056a1642399b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard new file mode 160000 +Subproject 0c70872a81aab39465606ab37333caf55064482 diff --git a/qtwayland b/qtwayland -Subproject 920387296abcead6fea2d801fb2f57c185657c4 +Subproject c07dc0c5cd138db2f222c6c58bc5778532cecf4 diff --git a/qtwebchannel b/qtwebchannel -Subproject bd0f933457227c615c5f11aacd471e58b88678e +Subproject a2c3b32d08ed24279609a8c01b09c1147a9ff6b diff --git a/qtwebengine b/qtwebengine -Subproject b052dcaf308d761fa8df39a09f0296b808c928b +Subproject 023168cf91dc7ac11ced1b6a60ca7aa24898781 diff --git a/qtwebkit b/qtwebkit -Subproject a750b262b856178eee47d546944bd095662dccf +Subproject 2e8517924b70a778463e463873eb3d8d0b623ee diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 2050389a34ac7a28d2ee8b62cc1a87bc471fe89 +Subproject f3f9e2a1b772b718335331a603a6bee748928e4 diff --git a/qtwebsockets b/qtwebsockets -Subproject edc358b213b192e8cdc925a4ae1f176c287d6ee +Subproject 00156d63eea2fb7681a8a00a3144392d6325e5c diff --git a/qtwebview b/qtwebview -Subproject b76a913c948e61184dbfe6e540cfcdc7f9f1158 +Subproject 9415249942b98768b8bc431fdb242ca1ac09ccc diff --git a/qtwinextras b/qtwinextras -Subproject 9463d25167fe1e2fc47180331827cbad2a805f6 +Subproject 8e816f25034287bb3f89317a631075533914102 diff --git a/qtx11extras b/qtx11extras -Subproject f27489d66cc6d8263130451c26c7e4ae40acc6b +Subproject b414120c60ef8c3cc2aad7dca41092647d741a3 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject fcb22201726669f52f98528d9a15f8cdbb126b4 +Subproject 9751d3d82eecb4f2c2a805783fbcce9ccd189fe |