Commit Graph

3192 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
d33150d656 Update submodules on '5.12.7' in qt/qt5
Change-Id: Ib92dbf253c2abd757aaa324b1ccefe31a26bb6c1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-25 05:32:50 +01:00
Jani Heikkinen
7fa1fba5a3 Merge remote-tracking branch 'origin/5.12' into 5.12.7
Change-Id: Idcebfb9dd7be92e0130f9aa36046a41532fd2589
2020-01-23 13:35:57 +02:00
Jani Heikkinen
7cfe9a0ebf Update enterprise license agreement v4.2.1
Task-number: QTBUG-80661
Change-Id: Icc3a1408b104ad2f08cd6959ee4bcb8da2fb69cf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 62d75f883c)
2020-01-19 06:58:38 +00:00
Kari Oikarinen
12a152be37 Adjust submodule branches 2020-01-16 11:33:55 +02:00
Jani Heikkinen
e0958213f9 Update QT LICENSE AGREEMENT Agreement version 4.2 in qt5 root
There seems to be own copy of QT LICENSE AGREEMENT in qt5 root as well.

That's why we need to update it to currently used version (4.2). At same
time let's remove version from file name to make update easier in the
future

Task-number: QTBUG-80485
Change-Id: I286390a0754dcba79927f4d74abaf06d761bedc1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit ad52452416)
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2020-01-15 11:42:38 +00:00
Liang Qi
b540aedf0a Merge remote-tracking branch 'origin/5.12.6' into 5.12
Conflicts:
	.gitmodules

Change-Id: I82e695715beec4fd0cd58e31b11606e24afc4b0f
2020-01-10 12:19:10 +01:00
Liang Qi
4adeebfdcf Update submodules on '5.12' in qt/qt5
Change-Id: I4261fd2d715ea61fb659dc070dc14aef77fc26e7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-10 08:59:10 +01:00
Heikki Halmet
770d9d70bf Provisioning: Change JDK script to use 'Remove' function from helpers
Task-number: QTQAINFRA-3369
Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dcfef7226f)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-12-03 08:00:06 +02:00
Dimitrios Apostolou
255e87ea24 Docker installation: do not depend on external repositories
Also updated the docker-compose binary to the latest one.

Task-number: QTQAINFRA-3279
Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit a270bcdb6b)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-20 12:35:38 +02:00
Dimitrios Apostolou
74195b12e6 DownloadURL last argument (targetFile) is now optional
Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 6cc2215b8c)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-20 12:35:32 +02:00
Dimitrios Apostolou
1f1832b5da Fix for DownloadURL to try alternative URL
Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 518e114dc7)
2019-11-20 12:35:26 +02:00
Dimitrios Apostolou
2217a2db89 DownloadURL now works with either wget or curl
The reason is that Ubuntu does not have curl at the very beginning of
provisioning scripts, and also does not have the repositories configured
in order to install it.

Change-Id: Ia485c1672f894bc800f199b742d238b2945938e5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 4e3a0f79fb)
2019-11-20 12:35:20 +02:00
Dimitrios Apostolou
8ed03772f7 Refactor DownloadURL.sh
Auto-detects and verifies all kinds of hashes, not only SHA1.
Hash verification is now an autonomous function.
If the file is found at the destination, skip redownloading it if the
hash is OK.
Runs on POSIX sh, not requiring bash.
Retain compatibility with previous version.

Change-Id: I9930336030aa776f49dc460fe766f3e831700255
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c0fce7a3b3)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-20 12:35:13 +02:00
Tony Sarajärvi
fcf4ccab36 Remove more of update notifiers
Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 2eab420e80)
(cherry picked from commit 7285bbee64)
2019-11-20 12:35:06 +02:00
Tony Sarajärvi
2cd2ec8723 Change local Ubuntu repo mirror in provisioning
The old mirror host Qt company used to sync their local mirror
from, stopped syncing from Ubuntu in October 2018.
The mirror mechanism was changed so that in the future if
addresses change, we don't have to touch the provisioning scripts
as the address is more general. Also a duplicate entry was removed.

Task-number: QTQAINFRA-3279
Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 5b77e74a5e)
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit 439fbad1c9)
2019-11-20 12:35:00 +02:00
Dimitrios Apostolou
47e7ec95ab Workaround broken local apt mirror
Local mirror is mirroring a public mirror, and for some reason there is
a mismatch of file sizes and file hashes for the dep-11 metadata files.

More info:
https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files

Task-number: QTQAINFRA-3351
Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ef7481b9cd)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-20 12:34:54 +02:00
Heikki Halmet
f3757051dd Workaround broken local apt mirror for Ubuntu 16.04
Local mirror is mirroring a public mirror, and for some reason there is
a mismatch of file sizes and file hashes for the dep-11 metadata files.

More info:
https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files

Task-number: QTQAINFRA-3351
Change-Id: I736b0c9627399839d713ec637cab9403a368601f
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit b0fb9bbc72)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-20 12:34:47 +02:00
Dimitrios Apostolou
a246212aad Workaround broken local apt mirror
Local mirror is mirroring a public mirror, and for some reason there is
a mismatch of file sizes and file hashes for the dep-11 metadata files.

More info:
https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files

Task-number: QTQAINFRA-3351
Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d
(cherry picked from commit ef7481b9cd)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-11-18 14:06:42 +02:00
Heikki Halmet
b0fb9bbc72 Workaround broken local apt mirror for Ubuntu 16.04
Local mirror is mirroring a public mirror, and for some reason there is
a mismatch of file sizes and file hashes for the dep-11 metadata files.

More info:
https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files

Task-number: QTQAINFRA-3351
Change-Id: I736b0c9627399839d713ec637cab9403a368601f
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-11-18 14:06:38 +02:00
Heikki Halmet
b92f565225 Provisioning: Install pre-builded openssl for Windows 7
Task-number: QTQAINFRA-3224
Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506
(cherry picked from commit 569fd1dabc)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-11-18 09:01:38 +02:00
Heikki Halmet
6fb05cf7ca Provisioning: Disable automatic cleanup from windows
Task-number: QTQAINFRA-3238
Change-Id: Ie64086b650016adb7129bd4c4592ca987cc1453b
(cherry picked from commit 60befd7508)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-15 11:35:55 +03:00
Heikki Halmet
1f986d47ca Provisioning: Update Cmake to version 3.7.2
QtCreator requires Cmake minimal version to be at least 3.7.0

Task-number: QTQAINFRA-3272
Change-Id: Id7f2d38ad0581c1aead4b5bac860ac193488ae1b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
(cherry picked from commit 3f9673d109)
2019-11-11 09:08:24 +03:00
Heikki Halmet
1713b9ef51 Provisioning: Hide password with /dev/null
Change-Id: Ic60ba668764c928977c826e02686a0cd341b995f
(cherry picked from commit 39a42f0abd)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-11 08:08:22 +02:00
Heikki Halmet
1ce967e4e8 Provisioning: Update Xcode package for macOS 10.14
Apple's certification was expired so Xcode 10.2.1 package needs to be
updated from the Apple's download server. Old one causing problems with
RTA tests.

Task-number: QTQAINFRA-3317
Change-Id: I5006f95ab420e26523d2621800d80322a52bb9a2
(cherry picked from commit 5b752460bc)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-11 08:08:18 +02:00
Heikki Halmet
11df2857b3 Provisioning: Upgrade OpenSSL version to 1.1.1d
Plus removing unused file install_openssl_111a.sh

Task-number: QTQAINFRA-3224
Change-Id: If5f9ee12e118e0329eb27f8d3ca9829011874382
(cherry picked from commit 52fe759eba)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-11 08:08:15 +02:00
Qt Submodule Update Bot
4a39410fae Update submodules on '5.12.6' in qt5
Change-Id: I3e49c6d83f5952869d0722674c83cf8db836ec8c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.6
2019-11-10 08:34:26 +00:00
Tony Sarajärvi
439fbad1c9 Change local Ubuntu repo mirror in provisioning
The old mirror host Qt company used to sync their local mirror
from, stopped syncing from Ubuntu in October 2018.
The mirror mechanism was changed so that in the future if
addresses change, we don't have to touch the provisioning scripts
as the address is more general. Also a duplicate entry was removed.

Task-number: QTQAINFRA-3279
Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 5b77e74a5e)
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-08 07:43:55 +00:00
Tony Sarajärvi
7285bbee64 Remove more of update notifiers
Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 2eab420e80)
2019-11-08 07:43:53 +00:00
Qt Submodule Update Bot
5426991bfa Update submodules on '5.12.6' in qt/qt5
Change-Id: I8956dd80e96d7444f18986f50d9d557f514a8b43
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-08 06:02:39 +01:00
Qt Submodule Update Bot
d2998cbab1 Update submodules on '5.12' in qt5
Change-Id: Ib982c93fc4865a666772890f0d009feef7593302
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-06 05:14:22 +00:00
Qt Submodule Update Bot
043adcf10a Update submodules on '5.12' in qt/qt5
Change-Id: If5a169337ae066d97fc34ba8740abafd71d34efc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-04 16:13:49 +01:00
Frederik Gladhorn
f8e6944b29 Adjust submodule branches
Change-Id: Ib27a2145631136383c6f580f9a6497cf78215eff
2019-10-30 15:35:02 +01:00
Heikki Halmet
f8d9c13ec2 Add allowUntrusted parameter for command line tools and refresh Xcode
Apple has signed their packages with certificate which has been
expired 24.11.2019. Packages are unusable without allowUntrusted
parameter

Also Xcode package for macOS10.13 needs to be refetched from
Apple's download to local cache

Task-number: QTQAINFRA-3317
Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891
(cherry picked from commit eb0ef419ec)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-30 06:45:15 +02:00
Heikki Halmet
7313c2fa10 Provisioning: Disable or delete unneeded tasks and services
Windows have lot's of tasks and services running which are slowing
the performance of build machine. Also 'windows' and 'windows
defender' updates need's to be "permanently" disabled.

Task-number: QTQAINFRA-3182
Change-Id: I8f6b237fcdc6e38fa9a06836d349821d86c58afc
(cherry picked from commit a3136bdbfe)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-29 21:29:11 +03:00
Liang Qi
c48621073f Update submodules on '5.12' in qt/qt5
Change-Id: I05d47b89fe7ef7e66b9251ec83cafd54234d1716
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-10 06:21:56 +02:00
Heikki Halmet
494c647040 Provisioning: Add Android NDK ROOT to environment variable
Task-number: QTQAINFRA-3181
Task-number: QTBUG-74952
Change-Id: I4cc6936c3b3eef32a1013888ced3950cd1f39407
(cherry picked from commit 30e7bf5745)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-25 14:26:30 +03:00
Heikki Halmet
495a20f266 Platform configurations: Move Android_ANY (clang-x86) to default
Arm targets from default change places with clang-x86 from qt5

Task-number: QTQAINFRA-3153
Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf
(cherry picked from commit fa03dbce1f)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-25 14:26:15 +03:00
Tuomas Heimonen
d4e3d3cac3 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-opengl' to remove xcb from static build
Add build flag '-no-vulkan' to disable vulkan

Task-number: QSR-517
Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-09 16:53:05 +03:00
Qt Submodule Update Bot
6402cb61b8 Update submodules on '5.12' in qt5
Change-Id: Ia09d245958bf1e24ba9f95e033dc3803d14edab4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-09 08:45:11 +02:00
Liang Qi
aceecad75d Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12" 2019-09-07 18:34:12 +02:00
Liang Qi
e56e0f699d Merge remote-tracking branch 'origin/5.12.5' into 5.12
Change-Id: I693eeef79b21804e2a0871bdd759271f8a97fcb4
2019-09-07 18:33:02 +02:00
Qt Submodule Update Bot
1d956e93d0 Update submodules on '5.12' in qt5
Change-Id: I7059a96dccad04c8647443c8b8e13c2ca88fc5b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 13:06:51 +02:00
Assam Boudjelthia
0d273deeef Provisioning: Fix version of libiodbc on MacOs
libiodbc latest version (3.52.13) was automatically installed causing
qt-config-gui to fail build, this installs version 3.52.12.

Task-number: QTQAINFRA-3188
Change-Id: I5b87ff04c2301a5471cc9abfa0849b6073a1bdd4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-06 06:05:40 +00:00
Tuomas Heimonen
be97b9ad72 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-xcb' to remove xcb from static build

Task-number: QSR-517
Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-06 07:11:51 +03:00
Tor Arne Vestbø
14c31bf8db Remove un-needed configure arguments for Apple OSes
Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-09-05 23:40:29 +02:00
Qt Submodule Update Bot
1c5e02896c Update submodules on '5.12.5' in qt5
Change-Id: Ife588e41d563bf4246ed7eff14186aa7583b3397
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.5
2019-09-04 19:29:15 +00:00
Qt Submodule Update Bot
c398a50e2d Update submodules on '5.12' in qt5
Change-Id: I3467f8edbbd5c52f53ed786c2c0f185e8558c1f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-04 06:56:00 +02:00
Tuomas Heimonen
5035d38525 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-qpa offscreen' to remove dependency to xcb libraries

Task-number: QSR-510
Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-03 21:37:50 +03:00
Qt Submodule Update Bot
ae3f765798 Update submodules on '5.12.5' in qt5
Change-Id: I22bbce6e60cc835a5dc9f88737e04ecc7a1fc3e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-03 06:44:29 +02:00
Qt Submodule Update Bot
4c65509d24 Update submodules on '5.12' in qt5
Change-Id: I1c5b9f51ed5a4dcb4469aa90439da993bc133319
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-30 22:02:37 +02:00