Commit Graph

3067 Commits

Author SHA1 Message Date
Heikki Halmet
de41591477 Fix openssl 1.1 library configurations
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-06-13 08:29:02 +03:00
Qt Submodule Update Bot
0e454d2a14 Update submodules on '5.12.4' in qt5
Change-Id: Id04721e958f15621a0a5b35aa0d44dc2d7238549
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-11 04:05:34 +00:00
Jani Heikkinen
01c38dfad8 Use link to qt5.txt instead of copy in qt3d-runtime.txt
Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 
(cherry picked from commit c5e443374a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-09 17:18:19 +03:00
Antti Kokko
1db94fc9ef Add platform configuration file for ogl-runtime repository
Use configuration from qt5.txt.

Change-Id: Ic788b70545169ee1fce5a97f016882cacd4a7908
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 11:49:11 +03:00
Qt Submodule Update Bot
fb534d1b44 Update submodules on '5.12.4' in qt5
Change-Id: Ic0a4f9340c23cc8a7b502870e690d1fccb54425f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:19:00 +03:00
Heikki Halmet
acff1703e4 Install prebuilded OpenSSL 1.1.1b for Windows 7
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 247b429c3c)
2019-06-10 10:19:00 +03:00
Juha Karjalainen
c8deeb3d05 Provision sed for windows 10
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 230a73409a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:19:00 +03:00
Juha Karjalainen
b9e92adf59 Provisioning: install msys2
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6465c42122)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:06:56 +00:00
Juha Karjalainen
31f5c48a80 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3e838f2a34)
2019-06-10 10:07:20 +00:00
Tony Sarajärvi
5fd662b550 Fix platform configuration files
Typos, duplicate entries and one missing rebase ended up
in the initial cherry-pick from 5.13

Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 
 
(cherry picked from commit d77fdecc11)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:16:58 +03:00
Tony Sarajärvi
6c6c6ca1a5 Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8cdf60fe64)
(cherry picked from commit d49c0cd0bb)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:16:52 +03:00
Tuomas Heimonen
1cf289d182 Remove tests from Saferenderer static build
Task-number: QSR-458

Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

(cherry picked from commit 3cc1c40ff5)
Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 17:25:13 +00:00
Heikki Halmet
a2b1dd2d0a Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dbaa42baa7)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:14:57 +03:00
Heikki Halmet
608788de2d Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c09135cb56)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:14:57 +03:00
Qt Submodule Update Bot
849df311b1 Update submodules on '5.12.4' in qt5
Change-Id: I73e3a64a4f9b0255c6e82ba638bf1f783e9867db
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-27 16:39:39 +02:00
Frederik Gladhorn
1e290229e4 Adjust submodule branches 2019-05-21 19:42:01 +02:00
Tuomas Heimonen
25349a29f7 Remove examples from Saferenderer static Windows build
Task-number: QSR-458
Change-Id: I3f0ba66590683ea221ccd207026602b3b89ee3a9
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2019-05-21 09:59:12 +03:00
Heikki Halmet
7e0fe78315 Add static build for Saferenderer
Task-number: COIN-229
Change-Id: I1808dbcf53a4e070167b485404c8cf9747dc04f5
Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-05-03 14:18:33 +03:00
Akseli Salovaara
56134fd7f6 Remove Packaging feature flag from UWP 2015 x86 integrations
UWP 2015 x86 binaries are not published anymore. Speed-up export
tool and reduce exported data disk space consumption by removing
Packaging feature flag from UWP 2015 x86 configurations.

Task-number: QTBUG-73544
Change-Id: Iad2016b6e6aec1787c7bbf31c6ef6f71db905c21
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-17 09:10:32 +00:00
Juha Karjalainen
94d140b746 Log more version information on macOS provisioning
Logs more version information to make easier to reproduce build.
Logs macOS build version, homebrew installed packages and apple's
installer installed packages.

Change-Id: Ia9f2842a3fd2e8e0acf1667c7435a19c7a878aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-12 15:47:26 +00:00
Tony Sarajärvi
8f073cea69 Do DeveloperBuild for Boot2Qt
Task-number: QTBUG-63152
Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-12 13:02:16 +00:00
Qt Submodule Update Bot
a41e568a78 Update submodules on '5.12' in qt5
Change-Id: Ie7ea68d3f32ca9348ca7f5f7017f6e86c00b860d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-08 09:33:16 +00:00
Qt Submodule Update Bot
d27f9e9b88 Update submodules on '5.12' in qt5
Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-30 18:44:54 +00:00
Liang Qi
22bb88ed07 Update submodules on '5.12' in qt5
Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-26 05:46:36 +00:00
Liang Qi
ffe0c11420 Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into refs/staging/5.12 2019-04-26 05:46:30 +00:00
Liang Qi
6dd08088fc Merge remote-tracking branch 'origin/5.12.3' into 5.12
Change-Id: Ib5cb484726a93f7b317e1dd8e74b446e6673cdbd
2019-04-25 16:05:59 +02:00
Simo Fält
09f28e9e1d Provisioning: Install python36-devel to rhel 7.4
The rhel Python3 system package is missing development libs.

Fixes: PYSIDE-996
Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-25 12:58:28 +00:00
Heikki Halmet
65cf2cb957 Provisioning: Install Vulkan to Rhel 7.4
Enables Vulkan support at compile time

Task-number: QTBUG-72763
Change-Id: If97adb030d50a147c9714afe3ef360291904b58a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-25 09:29:05 +00:00
Qt Submodule Update Bot
766fc425e3 Update submodules on '5.12' in qt5
Change-Id: I2c02e38847615cace282fa261ac5ac526eb6ece2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-24 16:37:45 +00:00
Qt Submodule Update Bot
12cde4e0da Update submodules on '5.12' in qt5
Change-Id: I2fa664d7b94bf511d4321e0698aba679ccb38ad0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-23 04:06:25 +00:00
Heikki Halmet
e72a082da5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b3e35cbac5)
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-18 10:01:57 +00:00
Qt Submodule Update Bot
712d5447bf Update submodules on '5.12' in qt5
Change-Id: I01acdb8d1dc3137abb193a9ccf1dba20d6953bcb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-16 21:19:06 +00:00
Qt Submodule Update Bot
da9243a97b Update submodules on '5.12' in qt5
Change-Id: Ie4120272ceba142d35265f2fbde316e2af8b30a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-14 06:51:45 +00:00
Qt Submodule Update Bot
f31970d5ac Update submodules on '5.12' in qt5
Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-12 17:40:23 +00:00
Qt Submodule Update Bot
21a6541aeb Update submodules on '5.12' in qt5
Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-11 16:03:13 +00:00
Qt Submodule Update Bot
8337e20fad Update submodules on '5.12.3' in qt5
Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.12.3
2019-04-11 03:06:13 +00:00
Heikki Halmet
791ec923a7 Provisioning: Echo Emscripten version information to versions.txt
Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-10 06:06:56 +00:00
Qt Submodule Update Bot
6db224cfc7 Update submodules on '5.12' in qt5
Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-10 06:06:53 +00:00
Qt Submodule Update Bot
261cc1bd8f Update submodules on '5.12' in qt5
Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-09 03:39:42 +00:00
Ivan Donchevskii
338fce191a Provisioning: Install i686 mingw on Windows 10 X64
Required to compile 32-bit binaries.

Fixes: QTQAINFRA-2896
Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-08 06:36:50 +00:00
Qt Submodule Update Bot
7ff76b89dd Update submodules on '5.12.3' in qt5
Change-Id: I216b93959076bc9402c715599398dea770cacde2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-05 11:29:29 +00:00
Tony Sarajärvi
b2afcc8405 Fix shellcheck complaints from provisioning scripts
Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-01 15:16:59 +00:00
Tony Sarajärvi
f678ae3769 Fix soft links and file modes of a few macOS provisioning scripts
Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-01 15:16:52 +00:00
Qt Submodule Update Bot
d0d7ade759 Update submodules on '5.12.3' in qt5
Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-30 20:26:00 +00:00
Qt Submodule Update Bot
b9e40e2fd7 Update submodules on '5.12' in qt5
Change-Id: I2df7f448e6f121039e343b3dd87d7fbbcbef25fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-28 19:35:06 +00:00
Qt Submodule Update Bot
35b489b1bd Update submodules on '5.12' in qt5
Change-Id: I7e7a49b60f4082d177c59dd3ccdd752fc4e3c5ca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-27 20:11:53 +00:00
Kari Oikarinen
84aaf6871c Adjust submodule branches
Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0
2019-03-25 10:07:35 +02:00
Qt Submodule Update Bot
b02d849d76 Update submodules on '5.12' in qt5
Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-23 08:32:42 +00:00
Tony Sarajärvi
665703efc9 Remove 32bit MSVC 2015 from the CI
Task-number: QTQAINFRA-2251
Change-Id: I4006c7390759e2eb357309de36eb23af007a576e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2019-03-23 08:32:35 +00:00
Juha Karjalainen
a97d669a20 Provisioning: Remove certificate printing to log
macOS openssl provisioning printed certificates to log. This patch
prevent printing certificates to log by redirecting it to /dev/null

Task-number: QTQAINFRA-2841
Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-03-22 12:06:56 +00:00