Compare commits

...

56 Commits

Author SHA1 Message Date
Jani Heikkinen
da2fcb2958 Update qtwebengine
Task-number: QTBUG-82894
Change-Id: I40cb18037a10cbf4205d6c2a6fbbefbcc259bc91
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2020-03-17 07:18:47 +02:00
Morten Johan Sørvig
10e843566e Provisioning: Bump Emscripten version to 1.39.8
The upstream URLs have changed:
 - emscripten packages now at github.com/emscripten-core/emscripten/archive/
 - binaries (llvm/binaryen/node) now at storage.googleapis.com/webassembly/emscripten-releases-builds/

Add support for unpacking tbz2 files. Keep caching as
before, update .emscripten config file with new paths.

Task-number: QTQAINFRA-3577
Change-Id: I53e72f19d3eefa0e2155493db4f93c8730c60334
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2020-03-12 20:05:18 +01:00
Qt Submodule Update Bot
fd2b713a87 Update submodules on '5.15' in qt5
Change-Id: I9c8617253ea6355c42b04cea4018e5ddf239f64f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-12 19:05:13 +00:00
Tony Sarajärvi
3b264301b0 Update openSUSE to 15.1
Task-number: QTQAINFRA-3455
Change-Id: Ie795f19c26ab0c42693388696edb344b4fa121a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-03-09 10:50:38 +00:00
Qt Submodule Update Bot
b601579dda Update submodules on '5.15' in qt/qt5
Change-Id: I14c3b2f4040378851ed9f7995c57ddf77948aa94
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-04 09:11:28 +01:00
Heikki Halmet
9e97db2714 Add missing -qt-zlib configuration parameters for MSVC2019
Change-Id: Ic0b6842b879ecc2951ae5aab3380c5d6e8343f97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-28 15:52:52 +02:00
Heikki Halmet
97aa53410e Add MSVC 2019 as packaging target and remove msvc2017 verification
Change will enable tests for MSVC 2019 and replace MSVC2017 as packaging
target.

Task-number: QTQAINFRA-2875
Task-number: QTQAINFRA-3432
Change-Id: Ifef3bd02b5fae6225a6c0ecdc412edbb488e25b1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-27 20:06:22 +02:00
Liang Qi
4ade81d4dd Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib51a6d362bf9cc5f6e6f56feadfe264216e24223
2020-02-25 09:51:20 +01:00
Qt Submodule Update Bot
c36c046f1a Update submodules on '5.15' in qt/qt5
Change-Id: If1114ea254b242d6b0f5e0dbdb1bd66155716f31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-25 08:24:28 +01:00
Heikki Halmet
7e126af82f Provisioning: Update GCC to version 9.2 for Ubuntu 18.04
GCC bug which breaks Webengine build should be fixed in GCC 9.2

Task-number: QTQAINFRA-3534
Change-Id: Ie0df7c67e0e96cca5632bcd0e6a3db822fcbffbe
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-19 11:01:15 +02:00
Liang Qi
769362560f Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I604824d346aed06b2e4e62b401fdc1d7040145c2
2020-02-16 12:04:36 +01:00
Liang Qi
e3bbc27500 Only update qtquickcontrols2 in this round
Change-Id: I779f3d0e1534a65e11ec33ea78b8621760f4e319
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-02-16 10:53:27 +01:00
Liang Qi
d6d9806883 Merge remote-tracking branch 'origin/5.14' into 5.15
Disable a no-gui build on Ubuntu 18.04 for 5.15.

 Conflicts:
	coin/platform_configs/default.yaml

Task-number: QTQAINFRA-3406
Change-Id: Ida5271d29b89375c045de0c4e6dc20840a0bc748
2020-02-14 09:49:03 +01:00
Jani Heikkinen
bb39b8730a Remove 'TP' status from submodules
From Qt 5.15 ->
   - QtQuick3D will be officially supported
   - QtLottie will be officially supported
   - QtQuickTimeline will be officially supported

Task-number: QTBUG-81818
Task-number: QTBUG-81834
Task-number: QTBUG-81922
Change-Id: I5e6efd5ccaf0bb25c83c9b88cc6cc2f8146993e2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-13 13:26:46 +02:00
Qt Submodule Update Bot
59a1bcec4e Update submodules on '5.15' in qt/qt5
Change-Id: I3b32b99876b25e76319a4ed90770c54256649958
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-13 07:08:54 +01:00
Qt Submodule Update Bot
e01ec6d6f5 Update submodules on '5.15' in qt/qt5
Change-Id: I558493f1e9f079824cd1a0e3752dbd1e498c6a27
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-12 03:48:05 +01:00
Qt Submodule Update Bot
5f01869f16 Update submodules on '5.15' in qt/qt5
Change-Id: I9b97f5ba649f7deb44c27080f8e5ea7f06ee0df6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-11 06:28:19 +01:00
Qt Submodule Update Bot
704ef6207d Update submodules on '5.15' in qt/qt5
Change-Id: Ib241a47a09ff3a86e3bc1c942e266269e0854950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-07 08:12:38 +01:00
Jani Heikkinen
eaf196219b Update qtwebengine
Update QtWebengine for Qt 5.15 Alpha: We need to have
4455081eabc8610112d1cce56a6f6fc64c0be236 in alpha

Task-number: QTBUG-81128
Change-Id: I0030bb44bbb24813e6bb57d8c4b05c83defb6d57
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2020-02-04 13:00:39 +02:00
Qt Submodule Update Bot
f8ab18df91 Update submodules on '5.15' in qt/qt5
Change-Id: I9852c8b494db112d0db24f4d14e355c169b3fecf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-04 09:27:34 +01:00
Qt Submodule Update Bot
9d78f3bd2b Update submodules on '5.15' in qt/qt5
Change-Id: I0efd7bb24f4cc36c39ff8ef08083fcca235c9e93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-28 06:36:11 +01:00
Qt Submodule Update Bot
f908a069d9 Update submodules on '5.15' in qt/qt5
Change-Id: I089e1ccd046ff13407656a53d2d3b1026cf4b16b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-26 19:26:56 +01:00
Qt Submodule Update Bot
75192dee07 Update submodules on '5.15' in qt/qt5
Change-Id: Ic2818ff944b945fad346ea5f4de96368c25c6413
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-15 07:08:43 +01:00
Qt Submodule Update Bot
cfa998544d Update submodules on '5.15' in qt/qt5
Change-Id: I5a22e3929eaefa4efe1cbfc3eed10954bc32e2c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-12 23:46:00 +01:00
Qt Submodule Update Bot
4a0e64744f Update submodules on '5.15' in qt/qt5
Change-Id: I5def23e806a8193bb20c4444c8c4a800bbbdbf0c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-11 11:13:58 +01:00
Qt Submodule Update Bot
a9633efe67 Update submodules on '5.15' in qt/qt5
Change-Id: I9965f7277a859698cbbc70f66f1a352cab63436a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-10 09:37:04 +01:00
Tony Sarajärvi
7286bd9f7a Remove WatchOS and tvOS from the CI
Task-number: QTQAINFRA-3430
Change-Id: I3e6696db80312cbc14373ad623291e58017c6083
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-01-06 10:47:44 +00:00
Qt Submodule Update Bot
2dc0539847 Update submodules on '5.15' in qt/qt5
Change-Id: I44e262601d39cabe1a29858d3fada7e8115a1df4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-06 09:01:05 +01:00
Qt Submodule Update Bot
3ae7991090 Update submodules on '5.15' in qt/qt5
Change-Id: I64956bc9216b5afe7f85f74267492e9c549acb4a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-04 23:45:59 +01:00
Qt Submodule Update Bot
cac62e47fe Update submodules on '5.15' in qt/qt5
Change-Id: I8f0be41a7d699b881d77bade00e6668992253818
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-03 08:26:49 +01:00
Qt Submodule Update Bot
a626d59af1 Update submodules on '5.15' in qt/qt5
Change-Id: I799197cc0d39360e2410005873330a73e9fbbe72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-01 23:45:59 +01:00
Qt Submodule Update Bot
1def8bb62c Update submodules on '5.15' in qt/qt5
Change-Id: Iab73ab91d8e449f851dcf46cfd169632e9c244fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-29 23:45:59 +01:00
Qt Submodule Update Bot
af7cf0fc3f Update submodules on '5.15' in qt/qt5
Change-Id: Ie54bc40cf2b0fdbe80313a5c17eeca8129e9619d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-26 23:45:59 +01:00
Qt Submodule Update Bot
c48c756bb9 Update submodules on '5.15' in qt/qt5
Change-Id: I53604693e5430dfc4f5bb56043bbe71df82d2c0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-22 23:45:59 +01:00
Liang Qi
14174482be Update submodules on '5.15' in qt/qt5
Change-Id: I9729f4621df730a8e62a5b8b8c8147b73e772f3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-16 11:02:38 +01:00
Liang Qi
4282752c19 Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If0f14c514b3c7ce7abf6b27221a26f921fef7f7f
2019-12-05 14:47:57 +01:00
Heikki Halmet
7c1c98e123 Provisioning: Install libpoppler
Poppler test requires this package

Task-number: QTQAINFRA-3253
Change-Id: Ifc0904ca020a8606b06a4032d5145fbf2f8063f1
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2019-12-03 17:51:21 +02:00
Liang Qi
4b6c05815a Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4dd840681bd84f7aeed58602b0c998c0e5807e10
2019-12-02 10:27:23 +01:00
Liang Qi
b5c9819be2 Update submodules on '5.15' in qt/qt5
Only qtmultimedia this round.

Change-Id: I00a94d159457f50a70a9b9eddedd3efd56870e51
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-21 18:42:57 +01:00
Liang Qi
f9183e71bf Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I03ba6455b8789eefb87a844d5fdbe0998cb02337
2019-11-20 07:29:43 +01:00
Liang Qi
b3f160bc39 Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I61d236e3d97ffd6e1cea460fba3d0eb2dac1d045
2019-11-07 08:08:49 +01:00
Qt Submodule Update Bot
ebc02c3265 Update submodules on '5.15' in qt/qt5
Change-Id: Id30b6ed350ca34593be6649e3671c6d57d99c8d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-07 07:31:11 +01:00
Qt Submodule Update Bot
d148d7b0f7 Update submodules on '5.15' in qt/qt5
Change-Id: I13014018eac8b9bb5fd769e82e987030fc08ad6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-06 07:12:09 +01:00
Qt Submodule Update Bot
8287111e7b Update submodules on '5.15' in qt/qt5
Change-Id: I2f00c0e3534f76108e7de3f072cf3ff9bb301a54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-05 06:28:59 +01:00
Qt Submodule Update Bot
db4e91ce90 Update submodules on '5.15' in qt/qt5
Change-Id: I0afddd8ede21a9693d9630f8d4ac848dc4d8b091
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-03 10:39:08 +01:00
Tony Sarajärvi
d406ff6398 Build examples on the no-widgets builds
Task-number: QTQAINFRA-1975
Task-number: QTBUG-63908
Change-Id: I0279fd4ca58ab389855e1152e9a8cee3ac97d502
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-26 14:11:07 +00:00
Qt Submodule Update Bot
37244913d3 Update submodules on '5.15' in qt/qt5
Change-Id: I75e624335c96d4812e47fd841db5145bb1523659
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-10 08:38:22 +02:00
Qt Submodule Update Bot
41fa18a06b Update submodules on '5.15' in qt/qt5
Change-Id: I6653f10b3662a8d4f6a90330a22ebaa38194a905
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-09 10:46:44 +02:00
Gatis Paeglis
1430513438 platform_configs: add -bundled-xcb-xinput to RHEL-7.6:Packaging
All libs, expect xcb-xinput have been dropped from 3rd party sources
in qtbase. When building default binaries for releases we used to have
"qt-xcb" switch to reduce dynamic depenendies of the binary. We still
need to do that for xcb-xinput (via -bundled-xcb-xinput) as this library
is not available on some of the supported distributions.

Change-Id: Iece12bc38978ddb66f84928f661924f076c3647e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-08 10:18:55 +02:00
Qt Submodule Update Bot
37e43d23fc Update submodules on '5.15' in qt/qt5
Change-Id: I5da2826877d73da02e854724976afef44c303ebc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-06 13:34:53 +02:00
Qt Submodule Update Bot
4f903d0139 Update submodules on '5.15' in qt/qt5
Change-Id: I823e6b4d3a4561603b2c57ff5c0ecd6738fd056d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-03 14:43:27 +02:00
Liang Qi
2d577a83ec Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml

Change-Id: I34cf4fb6818c17872e55f36149e8f91871d2aea1
2019-10-03 14:40:41 +02:00
Liang Qi
52068b49e8 Update submodules on '5.15' in qt/qt5
Change-Id: I2eafa1386aeb6356e4696bbee830330eeddefe9e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-03 13:39:47 +02:00
Liang Qi
f76c553d75 Update submodules on '5.15' in qt5
Change-Id: I9044304787288e600236d0793c1165cfb540b2a7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 21:32:01 +02:00
Kari Oikarinen
97afb2ce08 Adjust submodule branches
Change-Id: Id5eb73617e7c5783724910b58df6c991615a5caa
2019-08-27 09:31:36 +03:00
Gatis Paeglis
8f87412708 platform_configs: replace -qt-xcb with -xcb
... as we are removing -qt-xcb switch from qtbase as part of
stopping to bundle xcb sources.

Change-Id: I33d58b78a1d7f53d5941ebda7131bf35a71cc8e6
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-08-26 23:07:06 +02:00
71 changed files with 152 additions and 181 deletions

90
.gitmodules vendored
View File

@@ -1,60 +1,60 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.14
branch = 5.15
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.14
branch = 5.15
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.14
branch = 5.15
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.14
branch = 5.15
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.14
branch = 5.15
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.14
branch = 5.15
status = deprecated
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.14
branch = 5.15
status = essential
priority = 30
[submodule "qtdoc"]
@@ -62,7 +62,7 @@
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
branch = 5.14
branch = 5.15
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -83,14 +83,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -123,99 +123,99 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtserialbus"]
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.14
branch = 5.15
status = addon
priority = 10
[submodule "qtcanvas3d"]
@@ -229,98 +229,98 @@
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.14
branch = 5.15
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.14
branch = 5.15
status = addon
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 5.14
status = preview
branch = 5.15
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 5.14
status = preview
branch = 5.15
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative
path = qtquick3d
url = ../qtquick3d.git
branch = 5.14
status = preview
branch = 5.15
status = addon

View File

@@ -10,17 +10,11 @@ Configurations:
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-16'
Target arch: 'x86'
Compiler: 'MSVC2017'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-16'
Target arch: 'x86'
Compiler: 'MSVC2019'
Features: ['DisableTests']
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-16'
@@ -41,15 +35,10 @@ Configurations:
Compiler: 'MSVC2015'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015 -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2017'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2019'
Features: ['DisableTests']
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
@@ -58,12 +47,7 @@ Configurations:
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
Compiler: 'GCC'
@@ -71,16 +55,16 @@ Configurations:
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Template: 'qtci-linux-openSUSE-15.1-x86_64'
Compiler: 'GCC'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Template: 'qtci-linux-openSUSE-15.1-x86_64'
Compiler: 'ICC_18'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Template: 'qtci-linux-openSUSE-15.1-x86_64'
Target os: 'WebAssembly'
Compiler: 'GCC'
Features: ['Packaging', 'DisableTests']
@@ -94,7 +78,7 @@ Configurations:
Template: 'qtci-linux-RHEL-7.6-x86_64'
Compiler: 'GCC'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
-
Template: 'qtci-macos-10.13-x86_64-2'
Compiler: 'Clang'
@@ -116,20 +100,6 @@ Configurations:
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'TvOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'WatchOS_ANY'
Target arch: 'multi'
Compiler: 'Clang'
Features: ['DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
-
Template: 'qtci-linux-RHEL-7.6-x86_64'
Target os: 'Android_ANY'

View File

@@ -3,12 +3,12 @@ Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'

View File

@@ -8,9 +8,9 @@
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Target arch: 'x86'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x86-msvc2017 -qt-zlib'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x86-msvc2019 -qt-zlib'
-
Template: 'qtci-windows-7-x86-3'
Compiler: 'Mingw73'
@@ -25,15 +25,15 @@
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Target arch: 'armv7'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-arm-msvc2017 -qt-zlib'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019 -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-16'
Target os: 'WinRT_10'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Features: ['Packaging', 'DisableTests']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2017 -xplatform winrt-x64-msvc2017 -qt-zlib'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019 -qt-zlib'
-
Template: 'qtci-windows-10-x86_64-16'
Target os: 'Android_ANY'

View File

@@ -19,7 +19,7 @@
Compiler: 'MSVC2015'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
-
Template: 'qtci-linux-openSUSE-15.0-x86_64'
Template: 'qtci-linux-openSUSE-15.1-x86_64'
Target os: 'WebAssembly'
Compiler: 'GCC'
Features: ['DisableTests']

View File

@@ -1,6 +1,6 @@
-
Template: 'qtci-windows-10-x86-3'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
-
Template: 'qtci-linux-RHEL-6.6-x86_64'

View File

@@ -3,12 +3,12 @@ Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
Template: 'qtci-windows-10-x86_64-16'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging']
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'

View File

@@ -10,5 +10,5 @@
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
-
Template: 'qtci-windows-10-x86-3'
Compiler: 'MSVC2017'
Compiler: 'MSVC2019'
Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'

View File

@@ -88,15 +88,15 @@ function InstallGCC() {
# openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
if [ -f "/usr/sbin/update-alternatives" ]; then
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
--slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority" \
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" \
--slave /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" \
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}"
else
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc${suffixVersion}" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++${suffixVersion}" "$priority"
fi
echo "/usr/local/lib64" | sudo tee /etc/ld.so.conf.d/gcc-libraries.conf

View File

@@ -67,6 +67,9 @@ function InstallFromCompressedFileFromURL {
"xz")
tar -xf "$targetFile" --directory "$targetDirectory"
;;
"tbz2")
tar -xjf "$targetFile" --directory "$targetDirectory"
;;
*)
exit 1
;;

View File

@@ -39,59 +39,55 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
version="1.38.27"
version_node="8.9.1"
urlOfficial="https://s3.amazonaws.com/mozilla-games/emscripten/packages"
version="1.39.8"
urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk"
targetFolder="/opt/emsdk"
urlEmscriptenCache="$urlCache/emscripten-$version.tar.gz"
urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161"
# cross-platform emscripten SDK
urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz"
urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz"
sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f"
# platform-specific toolchain and node binaries. urls obtained from "emsdk install"
if uname -a |grep -q Darwin; then
urlEmscriptenLlvmCache="$urlCache/macos/emscripten-llvm-e$version.tar.gz"
urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/osx_64bit/emscripten-llvm-e$version.tar.gz"
urlNodeCache="$urlCache/macos/node-v$version_node-darwin-x64.tar.gz"
urlNodeExternal="$urlOfficial/node-v$version_node-darwin-x64.tar.gz"
sha1EmscriptenLlvm="66dffbc44cfcb7bcb1ed0d2658b519276c3077fa"
sha1Node="b9ec6fe9701d385e385886a4b171ba02bb6aead7"
node_js="$targetFolder/node-v$version_node-darwin-x64/bin"
urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2"
sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d"
urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz"
urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz"
sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43"
pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node'
else
urlEmscriptenLlvmCache="$urlCache/linux/emscripten-llvm-e$version.tar.gz"
urlEmscriptenLlvmExternal="$urlOfficial/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
urlNodeCache="$urlCache/linux/node-v$version_node-linux-x64.tar.xz"
urlNodeExternal="$urlOfficial/node-v$version_node-linux-x64.tar.xz"
sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb"
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
node_js="$targetFolder/node-v$version_node-linux-x64/bin"
urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2"
sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141"
urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz"
urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz"
sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa"
pathNodeExecutable='node-v12.9.1-linux-x64/bin/node'
fi
sudo mkdir "$targetFolder"
InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
InstallFromCompressedFileFromURL "$urlWasmBinariesCache" "$urlWasmBinariesExternal" "$sha1WasmBinaries" "$targetFolder" ""
InstallFromCompressedFileFromURL "$urlNodeBinariesCache" "$urlNodeBinariesExternal" "$sha1NodeBinaries" "$targetFolder" ""
sudo chmod -R a+rwx "$targetFolder"
echo "Writing $targetFolder/.emscripten"
cat <<EOM >"$targetFolder/.emscripten"
LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/'
EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer'
BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen'
NODE_JS='$node_js/node'
EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
SPIDERMONKEY_ENGINE = ''
V8_ENGINE = ''
LLVM_ROOT='$targetFolder/install/bin'
BINARYEN_ROOT='$targetFolder/install'
NODE_JS='$targetFolder/$pathNodeExecutable'
TEMP_DIR = '/tmp'
COMPILER_ENGINE = NODE_JS
JS_ENGINES = [NODE_JS]
EOM
SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-llvm-e$version/:$node_js:$targetFolder/emscripten-$version\""
SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\""
SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
echo "Emsdk = $version" >> ~/versions.txt
echo "Emsdk node = $version_node" >> ~/versions.txt

View File

@@ -169,6 +169,8 @@ installPackages+=(git-lfs)
installPackages+=(chrpath)
installPackages+=(gawk)
installPackages+=(texinfo)
# Needed for Poppler test in QtWebEngine
installPackages+=(libpoppler-cpp-dev)
echo "Running update for apt"
waitLoop

View File

@@ -5,4 +5,4 @@ set -ex
# shellcheck source=../common/linux/gcc.sh
source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
InstallGCC 9.1.0 50 3953fa0d34a467630088d2a43603f74a36a80468 ded538076858926d361af790d59c1f8440dd29b2
InstallGCC 9.2.0 50 2b3873263d4d6b09b37102078d80dcd7016b9392 44975966b15bca922ba64efa8ec3257726a79153

View File

@@ -5,7 +5,7 @@
set -ex
sudo zypper -nq install python-devel python-virtualenv
sudo zypper -nq install python-devel python-xml
# install python3
sudo zypper -nq install python3-base python3 python3-pip python3-devel python3-virtualenv python3-wheel

2
qt3d

Submodule qt3d updated: 597c9df33c...8b122b9b53

2
qtbase

Submodule qtbase updated: 875420f1c2...7cec37572a

2
qtdoc

Submodule qtdoc updated: bc37d41cd8...1c2369121e

2
qtqa

Submodule qtqa updated: 4098117a40...0a7b4f9f2f

Submodule qtscxml updated: 2ac294443a...85ef74c296

2
qtsvg

Submodule qtsvg updated: d072a505d7...8dbfbe633e

Submodule qttools updated: 698ffa215f...98a4e4291d