Commit Graph

2223 Commits

Author SHA1 Message Date
Liang Qi
da80efa880 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I9a419b82cc05549f6d8e6394bec5c349aa1c9c63
2018-01-12 21:14:23 +01:00
Liang Qi
c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
2018-01-12 21:13:56 +01:00
Liang Qi
ab25cb7af6 Update submodules on 'dev' in qt5
Change-Id: Iae26c4fdcf07ff7cd1ff53a98ce0fcbf4af1ffac
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-12 08:22:34 +00:00
Qt Submodule Update Bot
fb1c052f3b Update submodules on '5.9' in qt5
Change-Id: I7cfbf55bc3b57092e5f20a32866bb9cfa9160b9b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-11 20:01:11 +00:00
Frederik Gladhorn
d8e1574d5f Install p7zip-full, that contains the 7z binary
p7zip is only a minimal version containing 7zr.

Change-Id: I12531514490b6eb871419bdb61ea5896b175a678
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-11 14:20:50 +00:00
Liang Qi
19872ea843 Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.

Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
2018-01-11 15:13:13 +01:00
Qt Submodule Update Bot
271fedaf88 Update submodules on '5.10' in qt5
Change-Id: If56253b74477a0bdc034f1daf32920d3363a27f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-11 06:42:49 +00:00
Qt Submodule Update Bot
3e96fec2e1 Update submodules on '5.9' in qt5
Change-Id: If0b6b7bdb5151aa7488afed379785de63ca3aef2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-11 05:22:31 +00:00
Konstantin Tokarev
ebe2b86fd0 Remove 'Packaging' flag from QtWebKit MSVC2017/x86
Qt doesn't provide binaries for this platform.

Change-Id: Iab30435bb480ee898c2409f87facabb26fce9421
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-10 10:35:59 +00:00
Qt Submodule Update Bot
123ff665c3 Update submodules on '5.9' in qt5
Change-Id: I46157aa3edab44a436fbf9a02e6213f5c2a00f85
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-10 10:35:54 +00:00
Heikki Halmet
2a28ce864b Split Common folder based on operating system families
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes

Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-01-10 07:58:26 +00:00
Joni Jantti
52da24b78e Remove devtoolset sourcing from openssl provisioning on Ubuntu
This line is a leftover from RHEL script and needs to be removed on
Ubuntu.

Change-Id: I8fc8ab7cff808da997cb88a3cec4c65eaa1528a4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-10 07:58:22 +00:00
Jani Heikkinen
de5d8f3b4f Adjust QNX packaging builds for Qt 5.11
- Add missing 'Packaging' flag for linux and windows QNX builds
- Remove unnecessary 'Packaging' flag from mac QNX build

Change-Id: Ie4c49b9bd93f67f6a2dbbdece99da8c8f5fb3bef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-01-09 15:56:32 +00:00
Qt Submodule Update Bot
a8e3c392b2 Update submodules on '5.10' in qt5
Change-Id: I8c259b106a628a317c81a59c042e79c3f145a402
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-09 10:57:05 +00:00
Qt Submodule Update Bot
29f29e6ea8 Update submodules on 'dev' in qt5
Change-Id: I71684e67b6c6861fbcbcb6a652dc2d8b2f799e28
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-09 05:21:08 +00:00
Joni Jantti
dc6c54cb2d Provisioning: Ubuntu 16.04 - QNX700
QNX 7.0 is required by RTA on Ubuntu.

Task-number: QTQAINFRA-1671
Change-Id: I82821e096cfa2d35a2176eba6e753a0d71049b72
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-08 15:54:23 +00:00
Qt Submodule Update Bot
a8178a1888 Update submodules on 'dev' in qt5
Change-Id: Iadd154372d1cbf8b133ae8f858c9192c5afad239
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-08 04:56:41 +00:00
Liang Qi
d196866f31 Revert "Temporarily ignore qtwayland"
QtWayland adapted to new api in qtbase.

This reverts commit eba433c126.

Task-number: QTBUG-65600
Change-Id: If46f054adfb8a2db0d82acbd07cb39b2f512530e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-01-07 15:50:41 +00:00
Liang Qi
01b9b9051b Update qtwayland only
Change-Id: Id64117912e009a93422dce6434bc5d6782b881fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 15:50:38 +00:00
Tony Sarajärvi
2fe8d370e6 Add +x rights to provisioning scrips missing it and consolidate shebang
Change-Id: I1e1fb37bfffd0451c02166227805b40b48d31582
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-07 15:20:39 +00:00
Tony Sarajärvi
22e4664eb0 Fix opcua provisioning by sourcing .profile
When CMake is installed it exports its install
path into .profile. However, freeopcua doesn't source
it as builds do, so it couldn't find the cmake.
Also, as Ubuntu is using .profile in our builds,
this commit fixes so that the PATH is actually written
into the right file.

Task-number: QTBUG-65594
Change-Id: I561a88a07872436bb4a3bd62a2d55fd56a130121
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-07 15:20:37 +00:00
Tony Sarajärvi
84899eca4c Consolidate prefixes of provisioning scripts
Change-Id: I75a4bcb049a2c4d034a74b6838ffe7ddf2c3015e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-07 15:20:34 +00:00
Qt Submodule Update Bot
7139f29749 Update submodules on '5.10' in qt5
Change-Id: I8d3a6f72435d9bd1cf23146656b5bcef958e993d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 15:20:31 +00:00
Liang Qi
eba433c126 Temporarily ignore qtwayland
qtbase changed API, qssize_t was changed to qsizetype. In order for
qtwayland to update, qt5 needs to update first; but in order for
qt5 to update, qtwayland needs to compile.

Ignoring breaks cycle.

Task-number: QTBUG-65600
Change-Id: I978b0ed8dc86898ab1feb8b9cc47960e42095dfa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 13:30:20 +00:00
Liang Qi
04727e9936 Update submodules on 'dev' in qt5
Change-Id: I8b41e6c3f695547ea8b8449f60b2b87be5ddb718
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 13:30:17 +00:00
Qt Submodule Update Bot
65c714aaab Update submodules on '5.9' in qt5
Change-Id: I4901819f1c7141d151b287e945c1e0afa0ca5b16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 08:38:48 +00:00
Qt Submodule Update Bot
f71d4a3b97 Update submodules on '5.9' in qt5
Change-Id: I54bae68afc005a9e5d8d29e0766504d83d983e13
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-06 17:09:34 +00:00
Liang Qi
2a39f8e5fe Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
2018-01-06 09:08:20 +01:00
Liang Qi
89d4dec818 Merge remote-tracking branch 'origin/5.9.4' into 5.9
Conflicts:
	.gitmodules

Change-Id: I6a2446b8ed4212e3965b37cb2c25f35ba6ed7efc
2018-01-05 22:58:09 +01:00
Tony Sarajärvi
7a37b90702 Drop builds done with VS2013
Task-number: QTQAINFRA-1390
Change-Id: Id3de3706466508cdbfc586b2a39d96083e8434e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-05 20:43:53 +00:00
Liang Qi
b9b259fd40 Update submodules on '5.9' in qt5
Change-Id: I95a01ff67b3d16a9a989e3b714f82c94a92d6dc4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-05 20:05:41 +00:00
Joni Jantti
82a6a9347f Provisioning: Ubuntu 16.04 - Set timezone to UTC
Task-number: QTBUG-65435
Change-Id: I329926d0f83d47c9e69eee177c600ac629ee9415
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-05 20:05:38 +00:00
Joni Jantti
a742af96fb Provisioning: Ubuntu16.04 - CMake
CMake is missing from the clean installed Ubuntu 16.04.

Change-Id: I965bc3e55eb9b0765f483a84e5584e61054bdd80
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-05 12:30:25 +00:00
Jani Heikkinen
18f6169bee Merge remote-tracking branch 'origin/5.9' into 5.9.4
This merge wasn't done during final downmerge from '5.9' -> '5.9.4'

Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0
2018-01-05 07:47:26 +02:00
Oliver Wolff
f51fd755b5 Windows 10: Enable developer mode
In order to be able to run auto tests for UWP, developer mode has to be
enabled.

Change-Id: I4f20fb8d694d5148b7f976c1ef4bb23ff2fb57ba
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-01-05 05:37:08 +00:00
Jake Petroules
d3c2de907d Add Apple tvOS and Apple watchOS configs for all modules
...not just qt5. This will eliminate the semi-frequent integration
failures in qt5 submodules updates.

Change-Id: I99a4eb1cf41005adcfd12e385b663a5d8adbc628
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-05 04:15:19 +00:00
Maurice Kalinowski
a417fd37e0 Update FreeOpcUA version
This should fix the latest failures for FreeOpcUA unit tests.

Change-Id: I0a176d300336b208ebcd8f27b4b6218b7f538f5c
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-03 08:33:23 +00:00
Maurice Kalinowski
5fa40393c5 Apply path changes to running process
SetEnvironment only applies changes to PATH for new processes. Currently
the provisioning runs the scripts in one process, hence changes are not
applied when they are already needed.

Change-Id: I82a360686651a57e5c94330a9b56671fca1493e5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-03 08:33:19 +00:00
Maurice Kalinowski
cb327e54bd Fix open62541 provisioning on Linux
pip is an unknown command in the sudo environment.

Change-Id: Ia59c0b98eac6c3d22b8a452988abe17df6a83909
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-03 08:33:13 +00:00
Tony Sarajärvi
4fb893fcf8 Set up proxy for provisioning scripts
Task-number: QTQAINFRA-1669
Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-02 12:52:35 +00:00
Tony Sarajärvi
b9aae857f9 Fix shebangs and give provisioning scripts +x rights
Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-01-02 12:52:29 +00:00
Tony Sarajärvi
6eee3f6cff Add set -ex to 7z provisioning in RHEL 7.4
Change-Id: If6323055999830954df6893d72ff2031b34f0276
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-02 11:23:43 +00:00
Tony Sarajärvi
da3d21c0e6 Fix the Tier1 image that qtbase builds qemu builds with
Commit fcc0feaacb forgot to
update the Tier1 image in qtbase.txt. It only updated
default.txt and qtdeclarative.txt. Most likely because
qtbase.txt was added after initial changes were made
and not caught in rebase.

Task-number: QTQAINFRA-1574
Change-Id: If5da006172037c27dec5b3ae0b14330bc6f0149f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-02 11:23:38 +00:00
Qt Submodule Update Bot
c8b8ee9c00 Update submodules on 'dev' in qt5
Change-Id: If27f8d737219311944dccb795e70c1061817b965
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-01 18:12:35 +00:00
Lars Knoll
7a96b8dfd4 Revert "Temporarily remove two platforms from the qt5.git build"
This re-enables all platforms we should be testing on, after
having resolved the deadlock between qtbase and declarative.

This reverts commit 62efcd0c0a.

Change-Id: I2bcc34ad2d00036cc8ed37badbca67d4e68f5eac
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-30 08:08:33 +00:00
Lars Knoll
0bc8941e0c Update submodules on 'dev' in qt5
Change-Id: I7bef606c5610c1235d3893a1330d82ed0137259b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-30 08:08:30 +00:00
Qt Submodule Update Bot
497fc75f1a Update submodules on '5.9' in qt5
Change-Id: Id3233e66cce60596a1523a8685ee593a8dec19f2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:45 +00:00
Joni Jantti
19f8a741f3 Make provisioning script prefix style match across platforms
Currently we are using different styles and amount of digits for the
provisioning script prefixes. This change will unify them across the
platforms. Also removes a couple of duplicate files.

Task-number: QTQAINFRA-1668
Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-29 13:16:40 +00:00
Joni Jantti
d6f7d6ed8b Provisioning: VirtualBox for RTA
RTA needs VirtualBox for running GammaRayPlugin RTA tests.

Task-number: QTQAINFRA-1661
Change-Id: If66d6a63355ed5cc8c8525408c2dfc8c4f3d1bac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:36 +00:00
Joni Jäntti
fcc0feaacb Add clean Ubuntu 16.04 provisioning
Currently Ubuntu 16.04 template has stuff installed on its tier 1. We
want to have a clean installed tier 1 and install everything on it
during provisioning. This will save some disk space on our hosts.

Task-number: QTQAINFRA-1574
Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:32 +00:00