Compare commits

...

44 Commits

Author SHA1 Message Date
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
Dimitrios Apostolou
e4f9ac5607 Tag the docker images as "latest"
We will use this tag in qtbase to refer to the image to run, because
with the current sha1tree() tag, every minor change in the docker images
requires synchronized changes between repositories.

Task-number: QTBUG-79867
Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-12-05 09:13:39 +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
Qt Submodule Update Bot
b3da333101 Update submodules on '5.14' in qt/qt5
Change-Id: I7a09d7b24e5feb97ec891f0a92d35b12dcebde91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-01 22:30:59 +01:00
Qt Submodule Update Bot
56ad797f42 Update submodules on '5.14' in qt/qt5
Change-Id: Iaeaf6014ff94eef81ebba7db5ae3de5fa1c4cc2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-27 06:34:45 +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
48 changed files with 98 additions and 108 deletions

84
.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
branch = 5.15
status = preview
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 5.14
branch = 5.15
status = preview
[submodule "qtquick3d"]
depends = qtbase qtdeclarative
path = qtquick3d
url = ../qtquick3d.git
branch = 5.14
branch = 5.15
status = preview

View File

@@ -58,7 +58,7 @@ Configurations:
-
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'
@@ -89,7 +89,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'
@@ -112,20 +112,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

@@ -51,18 +51,20 @@ sha1tree () {
sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1
}
# Using SHA-1 of each server context as the tag of docker images. A tag labels a
# specific image version. It is used by docker compose file (docker-compose.yml)
# to launch the corresponding docker containers. If one of the server contexts
# (./apache2, ./danted, ...) gets changes, all the related compose files in
# qtbase should be updated as well.
# A tag labels a specific image version. In the docker compose file
# (docker-compose.yml) that launches the containers, the tag used is
# "latest". Here the images are also tagged with the SHA1 of each server
# context, so if needed we can modify docker-compose.yml to launch a very
# specific image, thus providing a way to stage backwards-incompatible changes
# across repositories.
source "$SERVER_PATH/settings.sh"
for server in $testserver
do
context="$SERVER_PATH/$server"
docker build -t qt-test-server-$server:$(sha1tree $context) $context
tag=$(sha1tree $context)
docker build -t qt-test-server-$server:$tag -t qt-test-server-$server:latest $context
done
docker images

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

2
qt3d

Submodule qt3d updated: 31d3ebed75...772d8d3dc7

2
qtbase

Submodule qtbase updated: 84892e5e69...c08b0cec2f

2
qtdoc

Submodule qtdoc updated: 1e27737f9e...f6d4d98486

2
qtqa

Submodule qtqa updated: 0f6a737ca7...bb56ecef33

Submodule qtscxml updated: d42bb288e5...bae669b37d

2
qtsvg

Submodule qtsvg updated: e489a32576...07e06c4bbf

Submodule qttools updated: 8437ead59e...08a55ca1e4