Compare commits

...

54 Commits
v5.9.6 ... 5.9

Author SHA1 Message Date
Qt Submodule Update Bot
6fdab53c60 Update submodules on '5.9' in qt5
Change-Id: Ib3f84d5b2e24b827098d873016a012eb07ec18ca
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-12-08 14:32:25 +00:00
Qt Submodule Update Bot
5c14167f02 Update submodules on '5.9' in qt5
Change-Id: Ie07025bffa51724908acf0415a0ee36bfdec3782
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-12-04 12:37:45 +00:00
Heikki Halmet
8509fa5e0d Provisioning: Upgrade Xcode for macOS 10.12
Change-Id: I4d7bfa6687c4c6ffcb56f68bf2df58d3d094cd30
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-28 10:30:33 +02:00
Heikki Halmet
58cfa8f0b1 Provisioning: Help script for removing items
Sometimes items are locked (access denied) so we need to have function
which waits and retry until removing is possible.

Task-number: QTQAINFRA-2806
Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745
(cherry picked from commit 76c80866af)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-28 10:30:32 +02:00
Heikki Halmet
a8ef3e016a 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-11-28 10:30:30 +02:00
Qt Submodule Update Bot
8d6b5d937d Update submodules on '5.9' in qt5
Change-Id: I313d1eec8c1cf9887590739a42e26a9af0bf8c0e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-27 06:10:08 +00:00
Johanna Äijälä
263b71cbbf Update Squish to 6.5.1
Change-Id: I1803e85ae4426a2f356f6812e88759479d6367cb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-20 10:02:53 +03:00
Qt Submodule Update Bot
d78dbeac69 Update submodules on '5.9' in qt5
Change-Id: I959486784ebe6745524cd26cbf9e3eae7f1cca93
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-14 14:10:22 +00:00
Heikki Halmet
4da5ec2868 Provisioning: Upgrade openssl to version 1.0.2t
5.9 branch don't support openssl 1.1.1 series so we need to use latest
version from 1.0.2

Task-number: QTQAINFRA-3336
Change-Id: I94eb9f553375da0ae8d04ceb55d1eace16f4f396
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 07:52:12 +02:00
Heikki Halmet
392b6a0329 Provisioning: Change Android-openssl installation
Also Android openssl version udpated to the latest one, 1.0.2t

Task-number: QTQAINFRA-3258
Task-number: QTQAINFRA-3336
Change-Id: I91572d26801d9c000523c85489d1eeb133d542ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-14 07:52:10 +02:00
Heikki Halmet
4c53e12dd5 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-11-14 07:52:05 +02:00
Qt Submodule Update Bot
543d3bf8af Update submodules on '5.9' in qt5
Change-Id: Ibcc370515e34429dedb94edef1945e7714d61b80
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-25 09:13:35 +02:00
Qt Submodule Update Bot
ff033fd3c4 Update submodules on '5.9' in qt5
Change-Id: I42592033085226d7e7c16f5921d17632695f0d9d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-31 21:27:00 +02:00
Qt Submodule Update Bot
6117d91d0f Update submodules on '5.9' in qt5
Change-Id: I8aaca7bca6c7b3ee43ca7d69a2adc42018c05297
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-03 21:55:46 +00:00
Liang Qi
a058217829 Merge remote-tracking branch 'origin/5.9.8' into 5.9
Change-Id: I42014a5d5b790d5f824454452962cd77c62b76e3
2019-05-02 17:52:55 +02:00
Qt Submodule Update Bot
bf9220699f Update submodules on '5.9.8' in qt5
Change-Id: Id1c734f3b666e7416a3c344bb29288e9d22b1297
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-10 03:08:20 +00:00
Heikki Halmet
22d4910097 Provisioning: Make gnuwin32 available for windows machines
This script will install gnuwin32 to the windows machines so it can be
removed from qt5

Task-number: QTBUG-73422
Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 0660a25cca)
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-04-08 06:43:46 +00:00
Qt Submodule Update Bot
8821b28895 Update submodules on '5.9.8' in qt5
Change-Id: I5e12496c9fbf2f9f37d0e81fcbdb3bf1b2099abc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-03 04:14:20 +00:00
Kari Oikarinen
9cada4a9db Adjust submodule branches
Change-Id: I64b8ccffa4595e566e0edfbc757199b96723b524
2019-03-25 09:49:45 +02:00
Qt Submodule Update Bot
72e740433f Update submodules on '5.9' in qt5
Change-Id: I1600548f3ea2934e3d5de0df6dfe6a598a9cb531
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-19 12:58:52 +00:00
Qt Submodule Update Bot
51a6c6bcff Update submodules on '5.9' in qt5
Change-Id: I29fec859c90ce44daf159c7761ea6efa42dc39bb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-04 20:03:32 +00:00
Heikki Halmet
3c7dfb889b Provisioning: Install signing tools to osx 10.11
Tools are needed by Offline mac build

Change-Id: I96efceffc3ee079dcd2c5849078742227b6cd0a2
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2019-01-15 13:10:31 +00:00
Qt Submodule Update Bot
1d2c745cb4 Update submodules on '5.9' in qt5
Change-Id: Ice911b24e7e8f9906e558234aeb5e7ad6414a592
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-13 21:26:44 +00:00
Qt Submodule Update Bot
87f9a714f4 Update submodules on '5.9' in qt5
Change-Id: I0090d013637d096dfc8483361fff1a04e622ec8c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-15 19:55:23 +00:00
Joni Jantti
eb5d1ad98c Provisioning: PyPFD2
Required for PDF file reading in RTA tests.

Task-number: QTQAINFRA-2103
Change-Id: I4da98460fb5d5ad26f9e1e16c503a0d94be047a6
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit bb6a91d5d4)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-11-29 06:42:24 +00:00
Qt Submodule Update Bot
0cb7ded692 Update submodules on '5.9' in qt5
Change-Id: I89fd12257d4f023aaa95b3595f167ac6186653f9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-29 06:42:16 +00:00
Qt Submodule Update Bot
4eaefc15a1 Update submodules on '5.9' in qt5
Change-Id: I05fec26c9b399406fbde6c530b09ebd969b88dd0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-18 08:33:42 +00:00
Joni Jantti
de1fbf0659 Provisioning: Update QNX packages with security patches
BlackBerry has released security updates for QNX 7.0.0 and 6.6.0 that
we want to include in CI since out customers will most likely have them
installed.

Task-number: QTQAINFRA-1535
Change-Id: I6f38ca8831bb91609f79385a2dcbc51302f68eb8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 07e349546c)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-11-08 19:18:09 +00:00
Joni Jäntti
59db0bd1f0 Provisioning: RHEL-6.6: Update curl
The currently used version of curl does not support TLS 1.2 or newer.
Since download.qt.io has minimum requirement of TLS 1.2 we need to
update the these packages.

Task-number: QTQAINFRA-2212
Change-Id: I4737443b5b2180a592a18d9095fe3f31063ba329
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 7e67d0e558)
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-08 19:18:06 +00:00
Qt Submodule Update Bot
b5679cccda Update submodules on '5.9' in qt5
Change-Id: I726bbbbf8f0b1a94e36dc48e538eaa6799e6a4c6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-08 19:18:03 +00:00
Juha Karjalainen
271d91eaf2 Provisioning: Update openssl to version 1.0.2p
Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 3b4ca5d6c0)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-11-01 10:10:39 +00:00
Qt Submodule Update Bot
12f43cab35 Update submodules on '5.9' in qt5
Change-Id: I7115f4713c73df3898a99001b478e685a5c0b036
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-25 11:02:21 +00:00
Liang Qi
8dd30dc459 Merge remote-tracking branch 'origin/5.9.7' into 5.9
Change-Id: I8b15a6b1bb4d9e6dc950ed7c849afc65d632a94e
2018-10-24 10:15:02 +02:00
Qt Submodule Update Bot
665d373034 Update submodules on '5.9.7' in qt5
Change-Id: Ie9d4f61c054d2cd1c7f5c04ecc517df35fe4dab4
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-17 09:51:11 +00:00
Qt Submodule Update Bot
61a97f46f6 Update submodules on '5.9.7' in qt5
Change-Id: I8edef7bae08172857a522919d0f62a8a8ceeca83
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-13 19:33:27 +00:00
Joni Jantti
e79280b423 Provisioning: Win7_x64 - Add Squish 6.3.0 win64 msvc12
This package is required by RTA.

Task-number: QTQAINFRA-1878
Change-Id: I0496445880f838de34ffd53f72fa05e0f0b0be58
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5085220907)
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-12 12:20:00 +00:00
Qt Submodule Update Bot
68f3b38420 Update submodules on '5.9.7' in qt5
Change-Id: Ib9ef6ce78fe730c4ec8c86e0d5c06937373be9b1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-08 13:26:49 +00:00
Qt Submodule Update Bot
50ca6e3465 Update submodules on '5.9.7' in qt5
Change-Id: I014cb637bae8c7de3c57eefeb019b83d67a0ca66
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-05 06:06:29 +00:00
Qt Submodule Update Bot
184524939a Update submodules on '5.9' in qt5
Change-Id: I73561f1c0986cca5b2c01eb64096c957e1b8269e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-30 18:34:47 +00:00
Qt Submodule Update Bot
1d04a39ea4 Update submodules on '5.9' in qt5
Change-Id: If28e9cc1e99587b60b1e0d41be805cff47932e64
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-27 11:03:37 +00:00
Frederik Gladhorn
8993bce5df Adjust submodule branches
Change-Id: Iaa453aceb16668c4a0f98332012ec6c6720e2077
2018-09-24 15:06:17 +02:00
Qt Submodule Update Bot
192c79384c Update submodules on '5.9' in qt5
Change-Id: Ia392939df0ae684e527dc9d2104c6ed43a2b1f9a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-17 07:28:39 +00:00
Maurice Kalinowski
08eceb8681 Provisioning: Fix downloading from github
Invoke-WebRequest uses TLS1.0 by default, which is not accepted by
Github anymore, causing all downloads from that site to fail. Upgrade to
1.2 to get downloads working again.

Change-Id: Ie242432937c273db5c345b38482dd74c19c3b4ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit bd8fe6a463)
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-17 07:28:36 +00:00
Qt Submodule Update Bot
24f5ef51db Update submodules on '5.9' in qt5
Change-Id: Ia2a4a63429273a02a808902b900f0612cd3466a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-08 13:03:09 +00:00
Qt Submodule Update Bot
718127cf45 Update submodules on '5.9' in qt5
Change-Id: Ib3f2b6feaa338e73f1dc5a446beda542542a6cc8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-27 05:10:18 +00:00
Qt Submodule Update Bot
96d6150ae9 Update submodules on '5.9' in qt5
Change-Id: I2aa7dd995b4c5b70cfe5303c849a3b862c90a123
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-17 10:04:42 +00:00
Heikki Halmet
da53bedd80 Provisioning: Relocate Libclang and correct sha1
Sha1's were changed because Liclang versions were rebuilded.

To prevent this Libclang versions are now copied to ci-files01-hki
which won't be affected if someone will rebuild libclang versions
to download.qt.io. This will also reduce download time

Task-number: QTQAINFRA-2156
Change-Id: I9164441cb876ee687db4878d06ba1c02cde601bb
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-08-16 08:31:07 +00:00
Tony Sarajärvi
91e8eaccad Provisioning: refactor squish install
Change-Id: I18e5f8f5d92cff5af2335cc5ac4cf571d27224ac
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit de4e9c2169)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-07-12 10:48:52 +00:00
Qt Submodule Update Bot
24df5493f1 Update submodules on '5.9' in qt5
Change-Id: I2c71da728151af6cce31ea8313b84a59e8729ea5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-24 09:10:17 +00:00
Qt Submodule Update Bot
034fe1a479 Update submodules on '5.9' in qt5
Change-Id: Iad2b96c70807691da0d49d36bbc83107c34e513e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-17 16:55:32 +00:00
Liang Qi
3cb5b2a5be Merge remote-tracking branch 'origin/5.9.6' into 5.9
Change-Id: I10014691a714f8457b9828c31cba76347dcd0f9c
2018-06-15 13:55:37 +02:00
Joni Jantti
18144d1144 Provisioning: Ubuntu - zlib1g:i386
RTA needs this package for QNX testing.

Task-number: QTQAINFRA-1930
Change-Id: I3587558bc1c8ece6dbb29b5f5184f4bfa744a790
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 93e31c1281)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-06-13 10:57:28 +00:00
Qt Submodule Update Bot
6591e88354 Update submodules on '5.9' in qt5
Change-Id: Ie104767229cdea2e62ae0a1cec3fe20108866e82
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-18 07:17:23 +00:00
Qt Submodule Update Bot
80b2b8ab8d Update submodules on '5.9' in qt5
Change-Id: I69f5ebbb8befd20e3a79e15d878ded9054ca4462
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-09 12:12:31 +00:00
75 changed files with 483 additions and 209 deletions

78
.gitmodules vendored
View File

@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.9.6
branch = 5.9
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.9.6
branch = 5.9
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.9.6
branch = 5.9
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.9.6
branch = 5.9
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.9.6
branch = 5.9
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.9.6
branch = 5.9
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
branch = 5.9.6
branch = 5.9
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -81,14 +81,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -121,27 +121,27 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtquick1"]
depends = qtscript
@@ -154,51 +154,51 @@
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.9.6
branch = 5.9
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
@@ -211,101 +211,101 @@
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.9.6
branch = 5.9
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.9.6
branch = 5.9
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.9.6
branch = 5.9
status = preview
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.9.6
branch = 5.9
status = preview
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.9.6
branch = 5.9
status = preview

View File

@@ -13,10 +13,10 @@ qtci-linux-openSUSE-42.3-x86_64 GCC
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-macos-10.12-x86_64-9 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static
qtci-macos-10.12-x86_64-9 IOS_ANY x86_64 Clang Release DisableTests Static
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release

View File

@@ -12,10 +12,10 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packagin
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-9 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-9 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.12-x86_64-9 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2

View File

@@ -36,15 +36,17 @@
# This script install OpenSSL from sources.
# Requires GCC and Perl to be in PATH.
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="1.0.2g"
version="1.0.2p"
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
targetFile="/tmp/openssl-$version.tar.gz"
installFolder="/home/qt/"
sha="36af23887402a5ea4ebef91df8e61654906f58f2"
sha="f34b5322e92415755c7d58bf5d0d5cf37666382c"
# Until every VM doing Linux Android builds have provisioned the env variable
# OPENSSL_ANDROID_HOME, we can't change the hard coded path that's currently in Coin.
# QTQAINFRA-1436
@@ -54,9 +56,8 @@ DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
tar -xzf "$targetFile" -C "$installFolder"
# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
mv "${opensslHome}g" "${opensslHome}"
mv "${opensslHome}p" "${opensslHome}"
pushd "$opensslHome"
echo "Running configure"
perl Configure shared android

View File

@@ -40,8 +40,8 @@ set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660.tar.gz"
sha1="E292CCAEF447AC1AA4DAD7802D604A5531ACD8D0"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz"
sha1="ffcf91489699c42ce9c1d74941f1829531752bbe"
folderName="qnx660"
targetFile="qnx660.tar.gz"
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"

View File

@@ -40,8 +40,8 @@ set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20180801-linux.tar.xz"
sha1="5d2c8f531823b1f7a2e20968dc698c187c7de94c"
folderName="qnx700"
targetFile="qnx700.tar.xz"
wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile"

View File

@@ -49,7 +49,7 @@ function InstallCommandLineTools {
hdiutil attach /tmp/$packageName
cd "/Volumes/Command Line Developer Tools"
echo "Installing"
sudo installer -verbose -pkg *.pkg -target /
sudo installer -pkg ./*.pkg -target / -allowUntrusted
cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3

View File

@@ -0,0 +1,77 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# This script installs Xcode
# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
# This can be achieved by fetching Xcode_8.xip from Apple Store.
# Uncompress it with 'xar -xf Xcode_8.xip'
# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
# with which you can run 'python parse_pbzx2.py Content'.
# This will give you a file called "Content.part00.cpio.xz" that
# can be renamed to Xcode_8.xz for this script.
function InstallXCode() {
sourceFile=$1
version=$2
echo "Uncompressing and installing '$sourceFile'"
if [[ $sourceFile =~ tar ]]; then
cd /Applications/ && sudo tar -zxf "$sourceFile"
else
xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
fi
echo "Versioning application bundle"
majorVersion=$(echo $version | cut -d '.' -f 1)
versionedAppBundle="/Applications/Xcode${majorVersion}.app"
sudo mv /Applications/Xcode.app ${versionedAppBundle}
echo "Selecting Xcode"
sudo xcode-select --switch ${versionedAppBundle}
echo "Accept license"
sudo xcodebuild -license accept
echo "Install packages"
# -runFirstLaunch is valid in 9.x
sudo xcodebuild -runFirstLaunch || true
echo "Enabling developer mode, so that using lldb does not require interactive password entry"
sudo /usr/sbin/DevToolsSecurity -enable
echo "Xcode = $version" >> ~/versions.txt
}

View File

@@ -52,7 +52,7 @@ if [ $# -eq 0 ]
# The default values are for macOS package
echo "Using macOS defaults"
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
url="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z"
sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
fi

View File

@@ -38,7 +38,7 @@ set -ex
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
version="6.3.0"
version="6.5.1"
# Branch version without dot
qtBranch="59x"
squishFolder="/opt/squish"

View File

@@ -39,31 +39,41 @@
# Msys need to be installed to target machine
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
$version = "1.0.2j"
$zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
$sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
$destination = "C:\Utils\openssl-android-master"
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils
Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
Rename-Item C:\Utils\openssl-$version $destination
Remove-Item -Path $zip
Remove-Item C:\Utils\openssl-$version.tar
# Android openssl was preconfigured manually. More info in jira ticket https://bugreports.qt.io/browse/QTQAINFRA-3258
# Android openssl was configured with following way and cached to ci-files01-hki.intra.qt.io\provisioning\openssl\.
#################################################################
## $version = "1.0.2p"
## $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
## $sha1 = "f34b5322e92415755c7d58bf5d0d5cf37666382c"
## $destination = "C:\Utils\openssl-android-master"
## Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
## Verify-Checksum $zip $sha1
## Extract-7Zip $zip C:\Utils
## Extract-7Zip C:\Utils\openssl-$version.tar C:\Utils
## Rename-Item C:\Utils\openssl-$version $destination
## Remove-Item -Path $zip
## Remove-Item C:\Utils\openssl-$version.tar
## Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
## Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
## Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
### Make sure configure for openssl has a "make" and "perl" available
## $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
## Write-Host "Configuring OpenSSL $version for Android..."
## Push-Location $destination
## Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
## Pop-Location
### Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
## C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
#################################################################
Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-gcc"
Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r10e\toolchains\arm-linux-androideabi-4.9\prebuilt\windows\bin\arm-linux-androideabi-ar"
Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r10e\platforms\android-18\arch-arm\usr"
# Make sure configure for openssl has a "make" and "perl" available
$env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
Write-Host "Configuring OpenSSL $version for Android..."
Push-Location $destination
Run-Executable "C:\msys\1.0\bin\bash.exe" "-c `"c:/strawberry/perl/bin/perl Configure shared android`""
Pop-Location
# Following command is needed when using version 1.1.0. With version 1.1.0 msys is not needed.
# C:\mingw530\bin\mingw32-make.exe include\openssl\opensslconf.h
$version = "1.0.2t"
$zip = "c:\users\qt\downloads\openssl-$version.7z"
$sha1 = "6670ff13906a04fdbfe0fcbc075ff21839dca984"
Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master_$version.7z \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master_$version.7z $zip
Verify-Checksum $zip $sha1
Extract-7Zip $zip C:\Utils
Remove-Item -Path $zip

View File

@@ -112,6 +112,7 @@ function Download
[string] $Destination = $(BadParam("a download target location"))
)
$ProgressPreference = 'SilentlyContinue'
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
try {
Write-Host "Downloading from cached location ($CachedUrl) to $Destination"
if ($CachedUrl.StartsWith("http")) {
@@ -159,3 +160,22 @@ function isProxyEnabled {
function getProxy {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
}
function Remove {
Param (
[string]$Path = $(BadParam("a path"))
)
Write-Host "Removing $Path"
$i = 0
While ( Test-Path($Path) ){
Try{
remove-item -Force -Recurse -Path $Path -ErrorAction Stop
}catch{
$i +=1
if ($i -eq 5) {exit 1}
Write-Verbose "$Path locked, trying again in 5"
Start-Sleep -seconds 5
}
}
}

View File

@@ -0,0 +1,46 @@
############################################################################
##
## Copyright (C) 2019 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script will install gnuwin32
$prog = "gnuwin32"
$zipPackage = "$prog.zip"
$temp = "$env:tmp"
$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/$prog/$zipPackage"
$externalUrl = "http://download.qt.io/development_releases/$prog/$zipPackage"
Download $externalUrl $internalUrl "$temp\$zipPackage"
Verify-Checksum "$temp\$zipPackage" "d7a34a385ccde2374b8a2ca3369e5b8a1452c5a5"
Extract-7Zip "$temp\$zipPackage" C:\Utils
Write-Output "$prog qt5 commit sha = 98c4f1bbebfb3cc6d8e031d36fd1da3c19e634fb" >> ~\versions.txt

View File

@@ -68,8 +68,7 @@ try {
Verify-Checksum $javaPackage $sha1
Run-Executable "$javaPackage" "/s SPONSORS=0"
Write-Host "Cleaning $javaPackage.."
Remove-Item -Recurse -Force -Path "$javaPackage"
Remove "$javaPackage"
Set-EnvironmentVariable "JAVA_HOME" "$installdir"
Add-Path "$installdir\bin"

View File

@@ -12,10 +12,10 @@ Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
if ( $archVer -eq 64 ) {
$sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0"
$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z"
$url = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-vs2015_64.7z"
} else {
$sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205"
$url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z"
$url = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-vs2015_32.7z"
}
$zip = "c:\users\qt\downloads\libclang.7z"

View File

@@ -36,7 +36,7 @@
# This script installs OpenSSL $version.
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
$version = "1_0_2j"
$version = "1_0_2t"
$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
@@ -47,8 +47,7 @@ if (Is64BitWinHost) {
$installFolder = "C:\openssl"
$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
$sha1 = "92288fb8f5d1af36960da518a21ed76cd9d7bd55"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex64
Verify-Checksum $packagex64 $sha1
@@ -74,7 +73,7 @@ if (Is64BitWinHost) {
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
$sha1 = "db9bb96d33f2393e2a9912a28e2921e6bc879203"
Write-Host "Fetching from URL ..."
Download $externalUrl $internalUrl $packagex86

View File

@@ -33,13 +33,18 @@
. "$PSScriptRoot\helpers.ps1"
# This script will install squish package for Windows.
# Squish is need by Release Test Automation (RTA)
# NOTE! Make sure 64bit versions are always installed before 32bit,
# because they use same folder name before a rename
$version = "6.5.1"
$version = "6.3.0"
# Qt branch without dot (*.*)
$qtBranch = "59x"
# So far Squish built with Qt5.9 works also with 5.10 and 5.11, but we have to be prepared that on some point
# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions.
$targetDir = "C:\Utils\squish"
$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"
$squishBranchUrl = "$squishUrl\$qtBranch"
@@ -49,23 +54,10 @@ $licensePackage = ".squish-3-license"
$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName
# This can be removed when using vanilla os
if ((Test-Path -Path "$targetDir" )) {
try {
Write-Host "Renaming old Squish"
Write-Host "Rename-Item -ErrorAction 'Stop' $targetDir $targetDir_deleted"
Rename-Item -ErrorAction 'Stop' "$targetDir" squish_deleted
} catch {}
}
Function DownloadAndInstallSquish {
Param (
[string]$version,
[string]$squishBranchUrl,
[string]$qtBranch,
[string]$bit,
[string]$targetDir,
[string]$squishPackage
)
@@ -78,82 +70,57 @@ Function DownloadAndInstallSquish {
Write-Host "Installing Squish"
Run-Executable "$SquishInstaller" "$SquishParameters"
Remove-Item -Path $SquishInstaller
if ("$bit" -eq "win64") {
if ($squishPackage.StartsWith("mingw")) {
$squishPackage64bit = "mingw_64"
} else {
$squishPackage64bit = "$squishPackage`_64"
}
Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
} else {
if ($squishPackage.StartsWith("mingw")) {
Rename-Item $targetDir\$squishPackage $targetDir\mingw
}
}
}
Function DownloadSquishLicence {
Param (
[string]$licensePackage,
[string]$squishUrl,
[string]$targetDir
[string]$squishUrl
)
# This can be removed when using vanilla os
if ($Env:SQUISH_LICENSEKEY_DIR) {
Write-Host "Removing SQUISH_LICENSEKEY_DIR env variable"
Remove-Item Env:\SQUISH_LICENSEKEY_DIR
}
Write-Host "Installing Squish license to home directory"
Copy-Item $squishUrl\$licensePackage ~\$licensePackage
}
Write-Host "Creating $targetDir"
New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir"
DownloadSquishLicence $licensePackage $squishUrl $targetDir
DownloadSquishLicence $squishUrl
if(($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 8.1 Enterprise"))
{
# Squish for MinGW
$squishPackageMingw = "mingw_gcc53_posix_dwarf"
Write-Host "Installing $squishPackageMingw"
DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw
mv $targetDir\$squishPackageMingw $targetDir\mingw
# Squish for Visual Studio 2015
$squishPackage = "msvc14"
$squishPackage64bit = "msvc14_64"
if ($OSVersion -eq "Windows 10 Enterprise") {
if (Is64BitWinHost) {
Write-Host "Installing $squishPackage64bit"
DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage
Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
DownloadAndInstallSquish $version win64 msvc14
}
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
DownloadAndInstallSquish $version win32 "msvc14"
Write-Host "Installing $squishPackage"
DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage
}
if ($OSVersion -eq "Windows 8.1 Enterprise") {
# Squish for Visual Studio 2013
$squishPackage64bit = "msvc12_64"
} elseif ($OSVersion -eq "Windows 8.1 Enterprise") {
if (Is64BitWinHost) {
Write-Host "Installing $squishPackage_64"
DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage
Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
} else {
Write-Host "Change secret file to normal one"
Run-Executable "attrib.exe" "-h C:\Users\qt\.squish-3-license"
DownloadAndInstallSquish $version win64 "msvc12"
DownloadAndInstallSquish $version win64 "msvc14"
}
}
if ($OSVersion -eq "Windows 7 Enterprise") {
# Squish for MinGW
$squishPackageMingw = "mingw_gcc53_posix_dwarf"
Write-Host "Installing $squishPackageMingw"
DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw
Rename-Item $targetDir\$squishPackageMingw $targetDir\mingw
DownloadAndInstallSquish $version win32 "msvc14"
# Squish for Visual Studio 2015
$squishPackage = "msvc14"
$squishPackage64bit = "msvc14_64"
} elseif ($OSVersion -eq "Windows 7 Enterprise") {
if (Is64BitWinHost) {
Write-Host "Installing $squishPackage64bit"
DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage
Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit
DownloadAndInstallSquish $version win64 "msvc12"
DownloadAndInstallSquish $version win64 "msvc14"
}
Write-Host "Installing $squishPackage"
DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage
DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf"
DownloadAndInstallSquish $version win32 "msvc14"
}

View File

@@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
Write-Host "Installing $package..."
Run-Executable $package "/q"
Write-Host "Remove $package..."
Remove-Item -Force -Path $package
Remove $package

View File

@@ -40,3 +40,5 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
if [ "$http_proxy" != "" ]; then
echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
fi
sudo yum update -y nss curl

View File

@@ -5,7 +5,7 @@ set -ex
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/shared/sw_versions.txt
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z"
SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952"
$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

View File

@@ -4,7 +4,7 @@ set -ex
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/shared/sw_versions.txt
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

View File

@@ -124,6 +124,7 @@ installPackages+=(curl)
installPackages+=(libicu-dev)
installPackages+=(zlib1g-dev)
installPackages+=(zlib1g)
installPackages+=(zlib1g:i386)
installPackages+=(openjdk-8-jdk)
installPackages+=(libgtk-3-dev)
installPackages+=(ninja-build)
@@ -156,6 +157,8 @@ installPackages+=(libbluetooth-dev)
#VirtualBox for RTA
installPackages+=(virtualbox)
installPackages+=(dkms)
#Pypdf for QSR documentation
installPackages+=(python-pypdf2)
echo "Running update for apt"
sudo apt-get update

View File

@@ -5,7 +5,7 @@ set -ex
BASEDIR=$(dirname "$0")
. $BASEDIR/../common/shared/sw_versions.txt
VERSION=$libclang_version
URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
SHA1="bbdbbc0296f42310077539b7247d285386119ef4"
$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION"

View File

@@ -45,6 +45,6 @@
set -ex
# shellcheck source=../common/macos/install_xcode.sh
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
source "${BASH_SOURCE%/*}/../common/macos/install_xcode_9_orHigher.sh"
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2_updated.tar.gz 9.2

View File

@@ -37,10 +37,10 @@ set -ex
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
version="8.3.2"
packageName="CommandLineToolsforXcode$version.dmg"
version="9.2"
packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg"
url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe"
sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf"
InstallCommandLineTools $url $url $sha1 $packageName $version

View File

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
opensslVersion="1.0.2k"
opensslVersion="1.0.2t"
opensslFile="openssl-$opensslVersion.tar.gz"
opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44"
opensslSha1="8ac3fd379cf8c8ef570abb51ec52a88fd526f88a"
# Below target location has been hard coded into Coin.
# QTQAINFRA-1195

View File

@@ -0,0 +1,138 @@
#!/usr/bin/env sh
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the provisioning scripts of the Qt Toolkit.
##
## $QT_BEGIN_LICENSE:LGPL21$
## Commercial License Usage
## Licensees holding valid commercial Qt licenses may use this file in
## accordance with the commercial license agreement provided with the
## Software or, alternatively, in accordance with the terms contained in
## a written agreement between you and The Qt Company. For licensing terms
## and conditions see http://www.qt.io/terms-conditions. For further
## information use the contact form at http://www.qt.io/contact-us.
##
## GNU Lesser General Public License Usage
## Alternatively, this file may be used under the terms of the GNU Lesser
## General Public License version 2.1 or version 3 as published by the Free
## Software Foundation and appearing in the file LICENSE.LGPLv21 and
## LICENSE.LGPLv3 included in the packaging of this file. Please review the
## following information to ensure the GNU Lesser General Public License
## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
##
## As a special exception, The Qt Company gives you certain additional
## rights. These rights are described in The Qt Company LGPL Exception
## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
##
## $QT_END_LICENSE$
##
#############################################################################
# Install tools for singing packages
# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
set -ex
cache="http://ci-files01-hki.intra.qt.io/input"
cacheSigningTools="$cache/mac/sign_tools"
targetFolder="/Users/qt"
keychains="$targetFolder/Library/Keychains"
Install() {
url=$1
targetFile=$2
expectedSha1=$3
echo "Fetching $targetFile from $url..."
curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
shasum "$targetFile" |grep "$expectedSha1"
}
# qt-license
sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt")
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
security default-keychain -s $loginKeychain*
echo "Unlocking Login keychain with password.."
security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*
echo "remove the "Lock after X minutes of inactivity" from login.keychain"
security set-keychain-settings $loginKeychain
# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
unlockKeychain=$targetFolder/unlock-keychain.sh
Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain
sudo chmod 755 "$unlockKeychain"
# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
csreq=$targetFolder/csreq_qt_company.txt
Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
chmod 755 "$csreq"
# iOS signing tools
devIDKeychain="Developer_ID_TheQtCompany.keychain"
shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca"
Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
echo "Opening $devIDKeychain.."
open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
echo "Unlocking $devIDKeychain with password.."
security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain
security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
iosPassword=$(<"$targetFolder/ios_password.txt")
iPhoneDeveloper="iosdevelopment.p12"
shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
iPhoneDistribution="iosdistribution.p12"
shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
mkdir "$targetFolder/Library/MobileDevice"
mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf"
Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision
# Removing password files
rm -fr "$targetFolder/login_keychain_password.txt"

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

View File

@@ -36,9 +36,10 @@
# This script installs QNX SDP 7.0
$zip = "c:\users\qt\downloads\qnx700.7z"
$url = "http://ci-files01-hki.intra.qt.io/input/windows/qnx700-20180801-windows.7z"
Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip
Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7"
Download $url $url $zip
Verify-Checksum $zip "E281897C957B5FAB249BABB2DEB77EEBB9BA75E6"
Extract-7Zip $zip C:\
Set-EnvironmentVariable "QNX_700" "C:\QNX700"

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

View File

@@ -0,0 +1,2 @@
. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1"

2
qt3d

Submodule qt3d updated: ea18da8361...fbd82f24d7

2
qtbase

Submodule qtbase updated: 9c50112304...86b933c430

2
qtdoc

Submodule qtdoc updated: a78613965f...39d2da2597

2
qtqa

Submodule qtqa updated: 82a3dfd8a6...da83b33dd0

Submodule qtscxml updated: 320735f9a4...c812d27039

2
qtsvg

Submodule qtsvg updated: 7a28db8f5b...6025be8593

Submodule qttools updated: c9eeabc7a7...01899896ac