Compare commits

..

2174 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
8337e20fad Update submodules on '5.12.3' in qt5
Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-11 03:06:13 +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
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
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
Qt Submodule Update Bot
7cc57995bf Update submodules on '5.12' in qt5
Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-22 08:56:29 +00:00
Qt Submodule Update Bot
209b8117bd Update submodules on '5.12' in qt5
Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-21 18:29:30 +00:00
Liang Qi
78afd2d4b6 Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626
2019-03-21 14:26:56 +01:00
Qt Submodule Update Bot
323dcdb60f Update submodules on '5.12' in qt5
Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-20 15:31:56 +00:00
Johanna Äijälä
c71f004171 Provisioning: add dependency walker to win10 x86
Needed by RTA.

Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-20 13:23:34 +00:00
Heikki Halmet
0660a25cca 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>
2019-03-17 08:16:25 +00:00
Johanna Äijälä
675deb1474 Add Squish for MSVC2017 x64 to Win10 x64 machines
Also Squish for MinGW x86 on Win7 x86.

Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-14 05:27:53 +00:00
Paul Wicking
cc1203311a Update comment in clang-format file
Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594
Reviewed-by: Andy Maloney <asmaloney@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-03-11 10:33:26 +00:00
Qt Submodule Update Bot
f9c5acb2ff Update submodules on '5.12' in qt5
Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-11 06:19:46 +00:00
Heikki Halmet
76c80866af 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
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-03-10 14:32:03 +00:00
Qt Submodule Update Bot
afa1b053fe Update submodules on '5.12' in qt5
Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-08 21:38:55 +00:00
Paul Wicking
e403403b39 Update clang-format config
Set column width to 100 as described in the official Qt coding style
(https://wiki.qt.io/Qt_Coding_Style).

Also, break constructor initializers before the colon and after the commas.

Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-03-08 13:53:33 +00:00
Qt Submodule Update Bot
ec772e3e4a Update submodules on '5.12' in qt5
Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-08 08:50:13 +00:00
Qt Submodule Update Bot
7100c54887 Update submodules on '5.12.2' in qt5
Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-03-08 04:47:08 +00:00
Johanna Aijala
88b35a4921 Update Squish to 6.4.3
Froglogic has not yet released Squish for Qt5.13 but we can use Squish
packages build with Qt5.12.

Remove msvc12 Squish, not needed.

Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-07 06:18:26 +00:00
Qt Submodule Update Bot
cfea5af0ed Update submodules on '5.12' in qt5
Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-05 06:41:22 +00:00
Qt Submodule Update Bot
b74bc40b41 Update submodules on '5.12' in qt5
Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-02 21:37:30 +00:00
Liang Qi
4df2866684 Update submodules on '5.12' in qt5
Change-Id: I20eba8a90e0683263245a01eac5a553c78961050
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-01 19:05:44 +00:00
Qt Submodule Update Bot
3a1e557e54 Update submodules on '5.12.2' in qt5
Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-28 19:08:08 +00:00
Antti Kokko
091820f6a1 Remove qt3d-runtime.txt symbolic link from platform configurations
Caused recursion in CI platform configuration parsing algorithm.
Add qt3d-runtime.txt back as regular file.

Task-number: QTQAINFRA-2804
Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-28 04:08:21 +00:00
Qt Submodule Update Bot
ffe8fd7701 Update submodules on '5.12.2' in qt5
Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-27 19:35:15 +00:00
Heikki Halmet
099b7ffe4c Provisioning: Update emsdk version
Task-number: QTBUG-73867
Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2019-02-26 11:11:15 +00:00
Qt Submodule Update Bot
becac559b7 Update submodules on '5.12.2' in qt5
Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-23 06:47:32 +00:00
Qt Submodule Update Bot
83d5226604 Update submodules on '5.12.2' in qt5
Change-Id: I131875e52b21ab1c354955cf82427470094da8ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-21 19:06:48 +00:00
Juha Karjalainen
9c60d8b190 Fix: Set correct path to environmental variable
Env variable BREAKPAD_SOURCE_DIR had /src at end which was
not needed.

Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-02-18 13:17:52 +00:00
Qt Submodule Update Bot
b3b6b100e6 Update submodules on '5.12.2' in qt5
Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-16 06:50:30 +00:00
Qt Submodule Update Bot
1c6f272dd0 Update submodules on '5.12' in qt5
Change-Id: Ia2c669226e73a545a19c941c5672972a92049534
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-15 07:41:30 +00:00
Qt Submodule Update Bot
391ba3a9ca Update submodules on '5.12' in qt5
Change-Id: Id119f941479fac5fa63c281ea21555ff99dc9a47
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-14 05:32:36 +00:00
Kari Oikarinen
d5d380f452 Adjust submodule branches
Change-Id: I309db20815d3b383155e6549b649607e956b8d89
2019-02-13 09:25:22 +02:00
Qt Submodule Update Bot
6967ec6b73 Update submodules on '5.12' in qt5
Change-Id: I75976d5f76dfac7cca5e13cf619a1d019b3bc5e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-13 05:39:18 +00:00
Juha Karjalainen
80deae9b74 Fix provisioning script dxsdk.ps1
Due to typo in dxsdk.ps1 provisioning script, it did not download from
cached location. Also checksum Check was missing.

Task-number: QTQAINFRA-2614
Change-Id: I321549721b256b85513fa1e4ff57ab1302e28f43
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-02-12 09:10:50 +00:00
Qt Submodule Update Bot
2dff8afa98 Update submodules on '5.12' in qt5
Change-Id: I758a05cd029f8252523681c19b657e76c7bb22dc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-12 08:55:19 +00:00
Qt Submodule Update Bot
f64ba39ce5 Update submodules on '5.12' in qt5
Change-Id: I5a8f3943047e4b222795c08aeb6593b0225ada99
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-11 10:12:41 +00:00
Qt Submodule Update Bot
ef7908d90c Update submodules on '5.12' in qt5
Change-Id: I7c99a0f95deb83a7aa81f68e1e1be2a7466b21d2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-08 08:10:27 +00:00
Qt Submodule Update Bot
9df5188493 Update submodules on '5.12' in qt5
Change-Id: I609f70ead9f00039d3c89f9e26b1301bb18931c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-07 08:56:38 +00:00
Liang Qi
774f18e61a Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: I73b9cf3d1cdb2a9f2f88e5568f61447469f45313
2019-02-06 15:44:34 +01:00
Qt Submodule Update Bot
4f7c2120a7 Update submodules on '5.12' in qt5
Change-Id: Ia0b08ce2f5513e78cffa4679d7465a30c95de8e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-05 19:16:28 +00:00
Tony Sarajärvi
4987a682ff Make qt3d-runtime.txt platform configuration a link
The content of qt3d-runtime.txt should always be the same as qt5.txt.

Change-Id: I6cdee575206332f6a719acfaacd7072a2178fd78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-04 11:11:43 +00:00
Liang Qi
bee2b8cdb9 Update submodules on '5.12' in qt5
Change-Id: Ib8b55ed958660be457a7f0852fad9a13d853f1a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-04 09:53:02 +00:00
Heikki Halmet
3cb745565f Provisioning: Renew iOS signing certificates
Task-number: QTQAINFRA-2690
Change-Id: I4a058c7d88b3daa24f62d5bc314ec2b0ecc8c383
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-02-01 10:50:32 +00:00
Qt Submodule Update Bot
92498bad9c Update submodules on '5.12' in qt5
Change-Id: I678bfdb4333abc34a29732aef1816d67f46c09cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-01 05:17:57 +00:00
Heikki Halmet
8ba5474da7 Provisioning: Install Google's Protocol Buffers
Protobuf is needed for Automotive Suite

Task-number: QTQAINFRA-2314
Change-Id: I12b4248f1de5aea88f573297a47b791b5b6296fb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-01-29 12:10:57 +00:00
Heikki Halmet
54cdba9e3d Provisioning: Remove Unneeded Android variables
Change-Id: I7dd008aef6465fdddd07e227b48e9b6361c13f81
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-29 12:10:53 +00:00
Qt Submodule Update Bot
6d90dd2191 Update submodules on '5.12' in qt5
Change-Id: I4fbd3ab3ddb7509366797dde34678d9739229e8d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-29 12:10:49 +00:00
Qt Submodule Update Bot
c45f3395ee Update submodules on '5.12.1' in qt5
Change-Id: I31b89394b870ee1c20d3be5add7fed60e9b23d80
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-29 09:21:03 +00:00
Qt Submodule Update Bot
f5f03ebfcd Update submodules on '5.12.1' in qt5
Change-Id: I3ad370f5f6312e22508a37f5618c979b60381987
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-26 07:21:10 +00:00
Qt Submodule Update Bot
1518bfdab6 Update submodules on '5.12' in qt5
Change-Id: I8060a5f51ae598fa7c8c348cfce212001250941d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-25 20:09:57 +00:00
Oliver Wolff
92b7d48bc2 Windows provisioning: Explicitly state OpenGL configuration to use
One of our configurations relied on ANGLE being the default OpenGL
configuration on Windows. This is the case at the moment, but might
change, so we should not rely on this behavior, but explicitly state the
configuration we are expecting.

Change-Id: Ie8cb215c2675faf8b514f4d9a43055638be1aaa8
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-01-25 11:57:42 +00:00
Aapo Keskimolo
daf0d3a4c6 Update qtsaferenderer platform configuration definitions
The project-specific platform configuration file is renamed to follow the
convention as for other projects. This will allow Coin to recognize the
configuration that are specific for qtsaferenderer project where they
were previously (unintentionally) ignored.

Removed QNX 7 as it is in the Qt mainline configuration.

Removed Ubuntu 16.04 as Ubuntu 18.04 is now supported.

Task-number: QSR-209
Change-Id: I505edc3741dbc047b2fc23bc409016d712596872
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-25 09:02:08 +00:00
Qt Submodule Update Bot
e8a1ca0581 Update submodules on '5.12' in qt5
Change-Id: I6403bd766964d9f65fadfbc514b01eeefdac540e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-24 19:31:16 +00:00
Tuomas Heimonen
22f032bd02 Build qtsaferenderer examples in Windows
Task-number: QSR-209
Change-Id: If8db177a77e3340f6b75f5a7fa768b6d8abec017
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-01-23 13:31:36 +00:00
Tony Sarajärvi
47d14b365e Accept license in Android SDK provisioning
A change in Android SDK prompts us now for
accepting license.

Task-number: QTQAINFRA-2591
Change-Id: I1ff05d84ccda743649c6d38784c6170e08f50eb1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-23 01:29:37 +00:00
Qt Submodule Update Bot
017d9e2ee3 Update submodules on '5.12.1' in qt5
Change-Id: Idc5f439eb75011f6ec422f37050ced3fec879a6c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-22 04:14:04 +00:00
Qt Submodule Update Bot
56b801a77e Update submodules on '5.12' in qt5
Change-Id: Ifa9eae2c3cfbd6fd001caf289e5ed360623d45f7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-21 10:11:54 +00:00
Heikki Halmet
4ddadb9aa3 Add Qt WebAssembly for all submodules
Task-number: QTBUG-63917
Change-Id: I61074c8b1acbf3ffd7781e7435784c4a15412c98
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-01-17 13:03:27 +00:00
Juha Karjalainen
3332223130 Provisioning: breakpad for qt3dstudio
Breakpad https://chromium.googlesource.com/breakpad/breakpad/
sources are needed for qt3studio. Also Breakpad need sources for
https://chromium.googlesource.com/linux-syscall-support.

Task-number: QT3DS-2650
Change-Id: I13c7534e1c6e97a1e345dad3c2c82eeb6428313d
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-17 09:45:12 +00:00
Liang Qi
34c751db5e Update submodules on '5.12' in qt5
Change-Id: I99897f12572b1927ef140ac0dd3430db2f97799c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-17 09:45:09 +00:00
Simo Fält
6d2929d1aa Provisioning: Move Android toolchain and config to win10
Installing Android toolchains and ssl headers to win10 template
and moving Android windows platform configs to win10 from win7.

Task-number: QTQAINFRA-1266
Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5a040ca46a)
2019-01-17 09:45:05 +00:00
Heikki Halmet
ea0825abe8 Provisioning: Remove update notifier
Update notifier is showing when vm is running.
It can affect to test results and that's why it need to be removed

Task-number: QTQAINFRA-2453
Change-Id: Icb27ba998ef9a51aaf8f40274c182b0c3dcd496a
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-01-17 09:45:02 +00:00
Maurice Kalinowski
209d09d530 Provisioning: Update Unified Automation OpcUA backend
Adding in the x64 bit installers to deployment. Furthermore, we can use
the msvc2015 installer to create msvc2017 binaries with Qt.
After the licensing change, we will be able to generate packages for all
msvc based installers.

Change-Id: I96db345b535a2518c758175137c808b15130ff41
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2019-01-16 07:30:37 +00:00
Heikki Halmet
c1f3a886ed Provisioning: Signtools for Windows x86
QtDesignStudio requires signtools for Windows x86

Task-number: QTBUG-72907
Change-Id: I7fb15cb07511cb89d3be00e1fe65247ecc21bcfe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-01-14 10:25:09 +00:00
Qt Submodule Update Bot
3855853e34 Update submodules on '5.12.1' in qt5
Change-Id: I0e1da14b452ed6237831dca5459627f29621182e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-14 06:45:22 +00:00
Qt Submodule Update Bot
da3ffbea17 Update submodules on '5.12.1' in qt5
Change-Id: Idf66e86252cea5b32bac9df3ebaa592936bc34d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-11 11:31:00 +00:00
Tuomas Heimonen
6930998900 Add qtsaferenderer extra targets for Coin
The cross-compile targets that qtsaferenderer needs do not exist in qt5
therefore we add those extra targets for CI.

Task-number: QSR-378
Change-Id: Ia07074392b09af8d111a957027407f85518e5d85
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit f7b6a4c276)
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
2019-01-11 11:21:58 +00:00
Liang Qi
3b5c100040 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Ib718f8343c710c22bb241867bf3b90eb11aabe05
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-10 19:31:52 +00:00
Juha Karjalainen
cfa7877afe Fix provisioning ODBC environmetal variables had : at end
CPLUS_INCLUDE_PATH and LIBRARY_PATH environmental variables had
 --> : <-- at end of variable. As this adds current dir to search
path this is undesirable and causes bugs.

Change-Id: Ia36c3f3f791f5d506eea15aba6be6d665049a922
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2019-01-10 12:32:57 +00:00
Qt Submodule Update Bot
616178cfb2 Update submodules on '5.12.1' in qt5
Change-Id: I8768b71048a5602b4a716b3a6da8b570f5e8e51a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-10 05:13:22 +00:00
Maurice Kalinowski
56c43a03cd Provisioning: Update Qt OpcUA backends
- Unified Automation SDK needs to be updated to 1.6x to reflect latest
API changes
- Open62541 is now inside 3rdparty of the Qt OpcUA module. Hence, no
need to provision it.

Change-Id: I96a3764053ca684fa71f9d49e998ebe0ce45a6ae
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2019-01-09 09:57:35 +00:00
Simon Hausmann
0b18f12f99 Prospective fix for git lfs installation
Keys used to sign package repositories tend to have expiry dates and
therefore need to be changed from time to time. Therefore hardcoding
the key we expect here will break (as it does right now) and it's better
to retrieve the expected key via a secure transport.

The old key - per
http://keyserver.ubuntu.com/pks/lookup?search=0xC2E73424D59097AB&op=vindex
- will expire on the 12 of January. That's probably why they changed the
key used to sign the repo before the expiry.

Change-Id: I39d082a6e12731b7eb0a8214a500101ca24f8af4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-09 09:56:56 +00:00
Juha Karjalainen
7028ee3184 Fix broken provisioning script DownloadURL.sh
DownloadURL returns 0 even when alt download fails.

Task-number: QTQAINFRA-2501
Change-Id: Id2fb1e0b4ff12a48b6adb27291f55fc129296233
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2019-01-09 09:14:02 +00:00
Qt Submodule Update Bot
ff12741299 Update submodules on '5.12' in qt5
Change-Id: I438761719f8deceebfc4a77fb660a18c8d6ed00b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-09 05:24:00 +00:00
Qt Submodule Update Bot
5256ac9c60 Update submodules on '5.12.1' in qt5
Change-Id: I6bfbe10520706d6c93037585b1e78b8b85cd3ea1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-09 05:22:17 +00:00
Liang Qi
0f8243bce8 Adjust submodule branches
Change-Id: I581af0bcf61605f9cc9ee24dc9dc1c916b91abbd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-09 05:22:13 +00:00
Juha Karjalainen
f4b482d844 Provision: install unixodbc-devel library
Adds odbc support for rhel7.

Task-number: QTBUG-72444
Change-Id: I49b1e91d9f87bdf98601627538aaa65b78440451
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-08 15:09:55 +00:00
Liang Qi
6d4cb1849a Merge remote-tracking branch 'origin/5.12' into 5.12.1
Change-Id: I53782263d173268fdfd3a3116c7fc6b596716992
2019-01-08 13:30:22 +01:00
Qt Submodule Update Bot
ca52fc7e29 Update submodules on '5.12' in qt5
Change-Id: I68c69cdc9b74c52bc0729fc51144a8fdd9d783ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-08 05:11:47 +00:00
Qt Submodule Update Bot
fe79ca444b Update submodules on '5.12' in qt5
Change-Id: I3ce524dab858e04fd2098385557893efbfa4c6ad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-07 06:02:09 +00:00
Qt Submodule Update Bot
6e4aed08e1 Update submodules on '5.12' in qt5
Change-Id: I52940e20029c38b79e9f437395d5cf91c4f9f7d4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-06 08:59:53 +00:00
Qt Submodule Update Bot
69b079c38e Update submodules on '5.12' in qt5
Change-Id: Iccf7bb925a120556c11db3396e67571c69ca9d68
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-04 20:58:52 +00:00
Heikki Halmet
72d0cfc6dc Provisioning: Add Squish Coco for RTA
Task-number: QTQAINFRA-2393
Change-Id: I391a2670a46835988da6fd1d9121172c706c7a21
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-01-04 14:09:59 +00:00
Qt Submodule Update Bot
07063160ae Update submodules on '5.12' in qt5
Change-Id: I8fea0b5ffaadbf5670fd2408b9f9c2e410c49cdb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 20:32:07 +00:00
Tony Sarajärvi
2657a96f0e Upgrade macOS 10.12.3 to 10.12.6
Also changes the resolution of the desktop to 1280x800x32,
timezone to GMT and upgrades Xcode.

Task-number: QTBUG-70180
Change-Id: I4620cbfa3033a100b0e325951a5a9ebcbfa92751
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 12:59:57 +00:00
Juha Karjalainen
e28da040ee Provisioning: Unify duplicated openssl provisioning script
MacOS(10.12 and 10.13) had two identical provisioning scripts for
openssl. Now unified under common.

Change-Id: If469a56d431e72b291a810fa9c1b701873fe382d
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-01-03 11:46:20 +00:00
Qt Submodule Update Bot
c231323b74 Update submodules on '5.12' in qt5
Change-Id: I77e2984900d563a6effb5e31c7f20654e5624b71
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 05:03:17 +00:00
Joni Jäntti
2306cb69c8 Provisioning: Windows: Disable automatic defragmentation
Automatic disk defragmentation is enabled by default on Windows
machines. It should be disabled to save some time.

Task-number: QTQAINFRA-2217
Change-Id: I3f024208bd35c9e305569e6b2b562f5a8b16f6f1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-02 12:23:01 +00:00
Qt Submodule Update Bot
05c1f1cf99 Update submodules on '5.12.1' in qt5
Change-Id: I1e2e226840416c8ae0166950dd62a3180dd52ee1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-01 19:34:46 +00:00
Qt Submodule Update Bot
b6283a31c8 Update submodules on '5.12' in qt5
Change-Id: Iafeef38423c165f29169adf499b554b78e1a6c60
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-31 21:30:43 +00:00
Tony Sarajärvi
2dd72ec5a6 Fix .ci.local to .intra.qt.io in provisioning scripts
Change-Id: I113095b337c3592757878fb919a0a18a60a8ce7e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-12-31 13:02:00 +00:00
Juha Karjalainen
55a990322b Provisioning: Install ODBC for macOS 10.12 10.13
This script installs libiodbc from brew and adds it to
CPLUS_INCLUDE_PATH and LIBRARY_PATH thus enabling configure to
find it and thus enabling odbc support for qt build on macOS.

Task-number: QTBUG-58956
Change-Id: I7f865800b580a87afcc480534da57ee546c74406
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-12-31 10:45:04 +00:00
Simo Fält
0a6d32bdd8 Provisioning: Install XCode 10.1
Task-number: QTQAINFRA-2323
Change-Id: I8fa4e146b2da71fba641f982d8114a916df42fc7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-12-31 08:12:20 +00:00
Qt Submodule Update Bot
f95cd8d3f1 Update submodules on '5.12' in qt5
Change-Id: I4b4259963187eeeb8a4914c5581f3b4c69d70aa5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-27 14:49:15 +00:00
Qt Submodule Update Bot
a1ace2e097 Update submodules on '5.12' in qt5
Change-Id: I252064eb22e7360fdaf31e97bca31da562af6d6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-25 21:30:44 +00:00
Qt Submodule Update Bot
4d785fc3db Update submodules on '5.12' in qt5
Change-Id: I211a94a83d207cbc522ba4256004c6d17caeeebd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-25 18:19:18 +00:00
Qt Submodule Update Bot
88a777b242 Update submodules on '5.12' in qt5
Change-Id: I16389902fc5c4ac89d3f287c1b31384a825f6b8e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-23 15:09:05 +00:00
Liang Qi
0e82de327b Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
2018-12-22 23:21:54 +01:00
Qt Submodule Update Bot
db99f0563d Update submodules on '5.12' in qt5
Change-Id: I03d42c54ab6e4acc9f67612f5a9e34e691ee0192
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-12-21 15:57:33 +00:00
Qt Submodule Update Bot
eee805a6f1 Update submodules on '5.12' in qt5
Change-Id: I45912749fc6e25f25e1065b8f7a751d5713ee2c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-20 05:18:52 +00:00
Juha Karjalainen
cbdd122e18 Provisioning: Update install android sdk to version 28
QT needs at least buildSdk 24 after commit
70057dfc0e53b7996acd5ef2c0f9c40aa3f66062. Updating provisioned sdk
version to 28. Please note minSDK <= targetSDK <= build/compileSDK.

Task-number: QTQAINFRA-2412
Change-Id: I0bf67cf42dfc6f707bdeae973a60c6601d2e73c3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-18 08:20:41 +00:00
Qt Submodule Update Bot
2a7ea7c53d Update submodules on '5.12' in qt5
Change-Id: Icca1ee8d9b84ca8766e2b6a774098f936970b3ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-18 08:20:33 +00:00
Heikki Halmet
deacc72f73 Provisioning: Hide squish installation output from provisioning log
This will prevent the output of unwanted information

Change-Id: I547e91ef344ec51f799b26f254139b03d20a315c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-12-17 07:16:39 +00:00
Liang Qi
65586dfb40 Update submodules on '5.12' in qt5
Skip qtdeclarative in this round due to QTBUG-72527.

Change-Id: I97aa9c1f472e88b3339dc39d841a5ef324b6fd90
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-14 16:36:59 +00:00
Liang Qi
43b493d223 Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I262b06902381426b304d815265662a315e217c0a
2018-12-12 20:39:25 +01:00
Qt Submodule Update Bot
a51b2dbf25 Update submodules on '5.12' in qt5
Change-Id: Ib45df166b0096ec1ec198e6cba792cd8a41c05a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-12 13:49:50 +00:00
Oliver Wolff
7bee789af3 Add configuration to run qtconnectivity tests on winrt
Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2018-12-12 13:49:45 +00:00
Juha Karjalainen
e21401751a Provisioning: Change how executables are waited to finish
This patch only affects Windows.
Python3 provisioning took over 30-35 minutes. As both
32 and 64 bit versions are provisioned it took over 1h
this change lowers time taken to 5 minutes.

start-process with -wait flag waits for given process and its
sub-processes to exit.  Wait-process insteads just waits for
process to exit.

Change-Id: Ib9a323dcf9e2d07318a0d259a72ca4c4d0a4ed80
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-12-12 13:49:42 +00:00
Juha Karjalainen
bc12bb763f Provisioning: Windows 10 32bit remote desktop access allow
Allow accessing windows remote desktop.

Task-number: QTBUG-71874
Change-Id: I70c0acc309bd5e2bc590e7cd35a918ca7940fd03
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-12-12 13:49:39 +00:00
Heikki Halmet
a1cd361579 Provisioning: Add missing prefix for yocto_ssh_configurations
Change-Id: I1a49737188cff6291b16797293a221043bdddad1
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-12-12 13:49:35 +00:00
Qt Submodule Update Bot
b093af0207 Update submodules on '5.11' in qt5
Change-Id: I72f653e9bdbece531d9d8d053e80d547a5ad56d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-10 17:22:19 +00:00
Liang Qi
37eb5a63b7 Merge remote-tracking branch 'origin/5.11.3' into 5.11
Change-Id: Iaa9c11ed5435e297e87b225060ea892bdb18deef
2018-12-09 20:32:46 +01:00
Qt Submodule Update Bot
e49086eb0d Update submodules on '5.11' in qt5
Change-Id: I07f616fb66b4b3e0f2a5a216c9fe56c0a0f42d6e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-04 04:31:00 +00:00
Qt Submodule Update Bot
061cf1f2ca Update submodules on '5.12.0' in qt5
Change-Id: I17131af760308b6520dd702eaf7aaf03b9a7d706
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-12-03 19:06:04 +00:00
Qt Submodule Update Bot
785042ea87 Update submodules on '5.12' in qt5
Change-Id: Ibd42172f2b956c18c692bf125390554e5868a438
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-03 18:25:11 +00:00
Qt Submodule Update Bot
c6b7e8d8a8 Update submodules on '5.11' in qt5
Change-Id: Idbb6f72e0092d564d76c81f41470e5d687864a00
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-01 07:49:11 +00:00
Qt Submodule Update Bot
2d30a2442c Update submodules on '5.11' in qt5
Change-Id: I7f6500a82a0967a0adafe719647f40013457a2a5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-30 15:15:37 +00:00
Qt Submodule Update Bot
5a1c876ec7 Update submodules on '5.12' in qt5
Change-Id: Id7db93fe860bd6986e4565c91fa03674306b7b88
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-29 21:31:07 +00:00
Tony Sarajärvi
4de6c12b17 Don't set http_proxy in its own subshell
The subshell actually meant, that the http_proxy environment
variable was never seen outside that check. Thus proxy was never
used where this was checked.

Change-Id: I069f43f13dffca98d8b60a47c2e105209018c84d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-11-29 20:20:26 +00:00
Gatis Paeglis
22e5bda9a9 provisioning: RHEL-7.4 install xcb-util-* packages
We do install them on Ubuntu and openSUSE. Eventually we want to stop
using bundled xcb libraries. Currently all builds of Qt on Linux use
-qt-xcb switch (see coin/src/targetenvironments.py::LinuxTargetEnvironment),
which is the reason why things build fine, even when packages are not
present on the system.

Change-Id: I856ddb5a17768b347aec3e593d6b969109a5c3a3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-29 20:20:13 +00:00
Gatis Paeglis
d9a869707e provisioning: consistently install libxkbcommon* on linux distros
Ubuntu was the only distro that installed both of the required packages:

installPackages+=(libxkbcommon-dev)
installPackages+=(libxkbcommon-x11-dev)

RHEL 7.4 did not explicitly install any, but got libxkbcommon-dev
pulled in as gtk3 dependency. Extract from provisioning log:

--> Processing Dependency: pkgconfig(xkbcommon) >= 0.2.0 for package: gtk3-devel-3.22.30-3.el7.x86_64
---> Package libxkbcommon-devel.x86_64 0:0.7.1-1.el7 will be installed

openSUSE explicitly installed libxkbcommon-devel, but not libxkbcommon-x11-devel.

Qt official binaries are built on RHEL, where we do not have
libxkbcommon-x11-dev installed. This means that XCB plugin and
Compose input plugin would fallback to using bundled sources.
It was actually desired until now that XCB/Compose use the
bundled sources instead of linking with the library from the
system, but this was only a lucky side effect. If we had installed
libxkbcommon-x11-dev on RHEL, then Qt binaries would end up
linking with the libxkbcommon from the system, because of the
missing "-qt-xkbcommon" configre switch for release builds.
We won't bundle libxkbcommon anymore, hence we need to install
the missing dependencies, as done by this patch.

Change-Id: I5c7b8ac38c266ce81cb5a3189a9082bfd581ee31
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-29 20:19:57 +00:00
Qt Submodule Update Bot
1af77cdacf Update submodules on '5.11' in qt5
Change-Id: I809770ab61b7f7544f96b218f89f55c66360e7b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-29 06:42:42 +00:00
Qt Submodule Update Bot
6ea6c85f06 Update submodules on '5.12' in qt5
Change-Id: I3641f84b3395cbb306be44e01beefceb776b2ed5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-29 06:42:34 +00:00
Qt Submodule Update Bot
820a1fbe7c Update submodules on '5.12.0' in qt5
Change-Id: Id850c3339ddc5fe82ee9c0ef13340e56001fbd15
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-28 04:11:02 +00:00
Juha Karjalainen
1deea3debc 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: Heikki Halmet <heikki.halmet@qt.io>
2018-11-27 05:44:26 +00:00
Qt Submodule Update Bot
76b9b7dbd3 Update submodules on '5.11.3' in qt5
Change-Id: I57a880017b682818a6ff0d8d6aaca204a5a7e87f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-27 05:44:22 +00:00
Qt Submodule Update Bot
7eff84a7e5 Update submodules on '5.12' in qt5
Change-Id: I522ab6944a7d30421e8087c9406c383c004cf7a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-25 08:48:33 +00:00
Qt Submodule Update Bot
4f4361e9fd Update submodules on '5.12' in qt5
Change-Id: I8259419a5f66db5da640c0d39fcc8a4410634767
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-23 08:12:30 +00:00
Ryan Chu
3ae624cd6e Docker Provisioning: Remove the fixed version of package dependencies
Free the dependencies of the specific Ubuntu packages. Ensure that test
server is using the latest version of the Ubuntu packages to test
network changes. Otherwise, all the docker files need to be manually
updated when upgrading to the next Ubuntu version (e.g. 18.04).

For debugging purpose, the installed packaged will be listed in the
provisioning logs.

Change-Id: I38d119d11f33cfd60dc34fcd57ec0fe1615e98f2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-11-22 07:57:53 +00:00
Qt Submodule Update Bot
8437deb219 Update submodules on '5.12' in qt5
Change-Id: I3cf40a50955c7de9808932c14a50433c30828322
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-22 07:57:49 +00:00
Qt Submodule Update Bot
5c4d85a9b9 Update submodules on '5.11.3' in qt5
Change-Id: I82d312c03bf12d9afe81316aad9a41bd4c4859e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-21 06:34:37 +00:00
Liang Qi
0c839f87fb Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
	coin/provisioning/common/unix/mqtt_broker.sh

Change-Id: I990dbf66b7120f2f1bcf202f0a2547a5ad9881f2
2018-11-20 19:37:06 +01:00
Qt Submodule Update Bot
2a4eafbc77 Update submodules on '5.12' in qt5
Change-Id: I00f8fe0ed2f8dd23ccb8bd093485f7d14bf15181
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-20 18:00:43 +00:00
Qt Submodule Update Bot
a9a4b97c70 Update submodules on '5.11' in qt5
Change-Id: Iaf5b3d17d80e26c1c205f5f18e16325ac9997484
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-20 04:30:56 +00:00
Qt Submodule Update Bot
07b6c0554b Update submodules on '5.12.0' in qt5
Change-Id: Ice89787923481000fca0409665a366ab8c3540be
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-20 04:06:57 +00:00
Qt Submodule Update Bot
50b85b0d38 Update submodules on '5.11' in qt5
Change-Id: Ifb302b8a2674c775e37605658f5451cf41eb0c58
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-17 21:23:23 +00:00
Qt Submodule Update Bot
0b488e88e7 Update submodules on '5.12' in qt5
Change-Id: I0006d5ddd851caaac5939ab2d0af2b2a09d3fdd3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-17 09:10:45 +00:00
Qt Submodule Update Bot
579d0ff553 Update submodules on '5.12' in qt5
Change-Id: I4a85369e42e3b8fe36ee754e46d8f9cc482e901d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-16 10:39:44 +00:00
Qt Submodule Update Bot
efb253f031 Update submodules on '5.12.0' in qt5
Change-Id: Ib05608e04fe7128046e0573e6c029262e2f8280b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-15 20:03:18 +00:00
Qt Submodule Update Bot
ac63ffa071 Update submodules on '5.12' in qt5
Change-Id: I8e14dc23368e1eef5cefe9696adc3dd75affa501
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-15 07:20:49 +00:00
Qt Submodule Update Bot
3094200a9f Update submodules on '5.12' in qt5
Change-Id: I9eed8d0a199294a41568c21640cf88b462035304
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-14 08:31:07 +00:00
Qt Submodule Update Bot
5b1848c02a Update submodules on '5.11' in qt5
Change-Id: Id003008d7ca8599fc4e1c5c06997659a04370ce3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-14 08:22:16 +00:00
Qt Submodule Update Bot
fbf22546be Update submodules on '5.11.3' in qt5
Change-Id: Ie32ea1823a1e4d33d4077db3c5d856b3ea216d90
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-13 18:40:34 +00:00
Qt Submodule Update Bot
fb83a49c30 Update submodules on '5.12' in qt5
Change-Id: Ic1a6f9bd8ec1ee005d437f81f8cda3348ce9ea72
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-13 05:54:35 +00:00
Heikki Halmet
84aaa89cf4 Provisioning: Fix path for fbx files
Currently Qt3d Studio build don't recognize fbx path because of space
in folder name. This change will fix it by taken use the packages which
don't have space in the folder name.

Task-number: QT3DS-2440
Change-Id: I502bb04489a03a5a81e164f8a86f3200f4ec3910
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2018-11-13 05:51:53 +00:00
Liang Qi
72b60b23f3 Update submodules on '5.12' in qt5
Skip qtdeclarative in this round due to QTBUG-71705.

Change-Id: Ic62440612e135c1cb8c5e740f4c13de7d37565bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-12 17:12:05 +00:00
Eike Ziller
7156b83710 Provisioning: Install perl on Windows 10 32-bit
Needed for Qt Creator build.

Change-Id: I5674f159de456a925e7a695546a53537f2517376
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-11-12 08:21:46 +00:00
Heikki Halmet
c89d9ed357 Provisioning: Add Rhel 6.6 for QtCreator
QtCreator need's to have provisioned Rhel 6.6 available.
(Partially) Reverts 54261be7c3

Task-number: QTQAINFRA-2270
Change-Id: Ie73c09181e0586dd0f4e9977208c9188037843d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-12 08:21:43 +00:00
Qt Submodule Update Bot
161c7e79ac Update submodules on '5.11' in qt5
Change-Id: I468056d9f0f591e259125814b2ecaed2f323135b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-12 04:30:56 +00:00
Qt Submodule Update Bot
caf4c58941 Update submodules on '5.11.3' in qt5
Change-Id: If25a7c3df9d53ff3bd84b75a1dd775e5ab9cd35f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-11 20:42:04 +00:00
Qt Submodule Update Bot
d649cc3740 Update submodules on '5.11' in qt5
Change-Id: I64984b9043e20918c6876bc5941b66dcdee257a4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-11 19:04:28 +00:00
Qt Submodule Update Bot
6c624aa570 Update submodules on '5.12.0' in qt5
Change-Id: I8c971bdcbbca07a8ec03cc4a3dda56ada4afcd00
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-11 18:59:51 +00:00
Qt Submodule Update Bot
c17352fc12 Update submodules on '5.11.3' in qt5
Change-Id: Ibf09137346dd0aef4f3dc0a784ad9f4c450f068a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-09 21:47:12 +00:00
Qt Submodule Update Bot
829447d340 Update submodules on '5.12.0' in qt5
Change-Id: If218ebc667e5378b1a2527f42c93c456045f1f45
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-09 13:10:15 +00:00
Heikki Halmet
4d15cea11a Provisioning: Update Java to 1.8.0 version in Rhel 6.6
Currently Rhel 6.6 have too old Java version for Jenkins. This need to
be updated so that machine can connect with Jenkins.

Task-number: QTQAINFRA-2377
Change-Id: I653df6f1f060bdc12164cc407fcc4cd873d2b24f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-08 13:52:01 +00:00
Matti Paaso
f335f71d02 Add new targets for packaging Jenkins
Change-Id: If2a769ef74ef01f663cc7673477346009d593e38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-11-08 13:51:34 +00:00
Qt Submodule Update Bot
3debc56a2d Update submodules on '5.11' in qt5
Change-Id: If42e9fef6d7d56d6bff98fbf79d06b3b99176221
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-08 04:31:03 +00:00
Heikki Halmet
1248a6787d Provisioning: Add scp and ssh location in the PATH for Windows
RTA needs to have these on the PATH

Change-Id: I59694737e9284bc31eefcc4ff89219665c2aa430
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-11-07 20:07:36 +00:00
Liang Qi
1bd6aab208 Update submodules on '5.12' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I8cd54eab0c1d6c7a95f6b97aac467dce9a9325da
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-07 20:07:27 +00:00
Qt Submodule Update Bot
471fa009d9 Update submodules on '5.11' in qt5
Change-Id: Ibcc62dda910fb662ff85c840ca00cc31f17a8f00
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-07 11:56:35 +00:00
Heikki Halmet
7974f26b20 Provisioning: Disable notifications and remove apport
These can cause flakiness during tests

Task-number: QTQAINFRA-2307
Change-Id: Ib8b850e3e1fabe3070bbd27785d043984e085cb7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-11-07 07:23:49 +00:00
Qt Submodule Update Bot
092b611d80 Update submodules on '5.12.0' in qt5
Change-Id: Ie4dca9cdf3a39a21cd8c380204860ee578733463
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-07 05:00:29 +00:00
Heikki Halmet
abe69c34bb Provisioning: Install chrpath for Jenkins
Task-number: QTQAINFRA-2270
Change-Id: I5afd9c6682ff6acb040ee069f3d7a179260f71d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-06 17:34:02 +00:00
Liang Qi
599370a6c4 Update submodules on '5.12' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I3eaa76e386a4d6a6b981a11a2eadd290059cb830
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-06 17:33:53 +00:00
Qt Submodule Update Bot
6d6e000932 Update submodules on '5.12.0' in qt5
Change-Id: I41d60616e029d96bb6580345a59ff906ded608d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-06 10:25:52 +00:00
Michal Klocek
417d293fa7 Add 'qttools' dependency for WebEngine
QtTools module is required for designer plugin.

Fixes: QTBUG-71404
Change-Id: I081740679dace196b9ff42d98bddd941848738f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-11-05 18:13:19 +00:00
Qt Submodule Update Bot
e4707bcdff Update submodules on '5.12.0' in qt5
Change-Id: Ic6ce42f23f2e567e79d69180b986ae25e97ea1c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-05 18:13:02 +00:00
Liang Qi
9a9f358508 Graduate qtremoteobjects and qtwebglplugin
Change-Id: I07a55764a4a6900d233d4bcfa20344009a9add26
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-02 14:56:28 +00:00
Oswald Buddenhagen
3bb63c22c4 Adjust submodule branches
Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750
2018-11-02 15:29:23 +01:00
Liang Qi
c1376f91df Update submodules on '5.12.0' in qt5
Change-Id: I2dc837b9d8e75176c5ecd3c42e17892676c1f65d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-02 11:21:46 +00:00
Joni Jäntti
7e67d0e558 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>
2018-11-02 07:59:24 +00:00
Tony Sarajärvi
b082d7d544 Replace .ci.local addresses with .intra.qt.io in provisioning scripts
Change-Id: I5e5bc084faabb28ffdf0437871445ecb8970bfb3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-01 07:16:57 +00:00
Qt Submodule Update Bot
195799f36c Update submodules on '5.11' in qt5
Change-Id: Id39d804153ed5bd04545fdd5fd90ec3cb7de88cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-01 07:16:52 +00:00
Joni Jantti
37eeb598cc Provisioning: PyPFD2
Required for reading PDF doc files 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-10-31 19:39:10 +00:00
Liang Qi
d3299a3d27 Merge remote-tracking branch 'origin/5.12' into 5.12.0
Change-Id: I41f6780d67aeb9e065d86f53feee71d38c00428f
2018-10-30 12:22:55 +01:00
Antti Kokko
01faa84629 Update qt3d-runtime.txt targets
Add missing macOS and Windows Android arm64 targets.
Remove iOS target that is now included in default.txt.

Change-Id: Ifc20336b94477b2f8be456ef7f7f8bfaf8bf1190
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-30 09:56:38 +00:00
Qt Submodule Update Bot
82ca14ffd0 Update submodules on '5.12' in qt5
Change-Id: I33be3020b077a33f128f18bc920aa89746ba5590
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-29 17:29:18 +00:00
Oswald Buddenhagen
1af3c19fc8 commit template: add missing trailing space to Fixes footer
Change-Id: If966752eeebc7044a9a8ba5a2a66b8c03846c771
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-10-29 15:29:44 +00:00
Qt Submodule Update Bot
7ea65aec65 Update submodules on '5.11' in qt5
Change-Id: I2fd329c2d1097b89ab86768927b605af4c6e2a0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-26 10:28:13 +00:00
Juha Karjalainen
3b4ca5d6c0 Provisioning: Update openssl to version 1.0.2p
Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-10-26 07:23:14 +00:00
Qt Submodule Update Bot
99f8704350 Update submodules on '5.12' in qt5
Change-Id: I38d842c7d9df454cd653ca48574023b25512c62c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-26 07:22:38 +00:00
Qt Submodule Update Bot
70162c557c Update submodules on '5.12' in qt5
Change-Id: Iba893056096d70731449005033a5e3e13d6650c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-25 16:11:03 +00:00
Simo Fält
d65d71731f CI platform config: Make 32 bit msvc2017 config as default
Swapping 32 bit windows packaging configs so that MSVC 2017 is
built as default config and MSVC 2015 only for qt5.

As the config is not part of the default.txt we have to add it as
module specific config.

Change-Id: I3c423c2c80d0093fdeca340d6faa8e162c03b5cd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-25 12:35:07 +00:00
Qt Submodule Update Bot
26cece9f93 Update submodules on '5.11' in qt5
Change-Id: I71eaf20c20124a8634e715aaee11bc0118a84a23
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 13:26:46 +00:00
Qt Submodule Update Bot
41b0fbb462 Update submodules on '5.12' in qt5
Change-Id: I86f12f4294fcda16d1aff7ee73681d9fef37403e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 11:39:38 +00:00
Qt Submodule Update Bot
96a07386fb Update submodules on '5.11' in qt5
Change-Id: I7cd87f5de55b09332b9bfcfd5d4532cbc09072fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-23 18:13:07 +00:00
Qt Submodule Update Bot
3f76170c93 Update submodules on '5.12' in qt5
Change-Id: Ia2c18f2579af6a1c3e0277cf73a1a219e14b5295
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-23 18:12:59 +00:00
Oswald Buddenhagen
ff2c96f483 Adjust submodule branches
Change-Id: I43f7c5c76e0cd646e506e7071e9e8c450bdc1b03
2018-10-22 15:52:09 +02:00
Qt Submodule Update Bot
ab7b56afe6 Update submodules on '5.11' in qt5
Change-Id: I2a43b09d5d15775ed17aaa782bb81741f1e15c1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-22 00:20:14 +00:00
Qt Submodule Update Bot
7d01b06b8f Update submodules on '5.12' in qt5
Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-22 00:19:52 +00:00
Qt Submodule Update Bot
b621cfd505 Update submodules on '5.12' in qt5
Change-Id: Ie8e19006d5e007e732ca0f68d8128ac3dfc8f498
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-21 09:33:06 +00:00
Tony Sarajärvi
4667cfc432 Update Android NDK and SDK on macOS envs
Task-number: QTQAINFRA-2244
Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-20 05:16:02 +00:00
Tony Sarajärvi
bc5e5baf55 Update Android NDK and SDK on Windows envs
Task-number: QTBUG-47672
Change-Id: I3e6526b296f15927b90ab3310d91f8505b0228b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-20 05:15:55 +00:00
Tony Sarajärvi
97efaacb2b Update Android NDK and SDK on Linux envs
Task-number: QTBUG-47672
Task-number: QTQAINFRA-2298
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I42c87d8453423530173b826c09dc6eb4bf9ad5b8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-20 05:15:40 +00:00
Qt Submodule Update Bot
bb1f484318 Update submodules on '5.11' in qt5
Change-Id: Id7020bdeb4cafb5e6fe83fcf8833b882695205c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-19 10:47:06 +00:00
Qt Submodule Update Bot
6de2d1d211 Update submodules on '5.12' in qt5
Change-Id: I09368e4171c76cc52110b7778491d512d0d43de1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-19 08:27:29 +00:00
Joni Jäntti
c51cbddc90 Provisioning: Windows_7_x86: libclang
libclang is required for qdoc.

Task-number: QTBUG-69793
Change-Id: I60b54b4338ed6fd3bae99813e268816e063c648a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-10-18 11:07:43 +00:00
Joni Jäntti
7e40cd3a7f Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0
Xcode and command line tools version 10 have been released, we
should start building our Qt releases with it, both for iOS and
macOS.

Installing Xcode 10.0.0 requires OS version update to 10.13.6. A new
tier 1 image has been created with the updated OS and this change
takes it into use.

Task-number: QTQAINFRA-2274
Change-Id: Ida7df234ecfd356b2cb2545ae10cd501dc47197b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-10-18 10:59:34 +00:00
Oswald Buddenhagen
4c2fea3d5d fix setting QTDIR_build for default_pre.prf
adding it to the super cache makes no sense, as that's read before
spec_pre.prf, which clears CONFIG. use the regular cache instead.

submodules do not inherit that setting, and they don't need to as per
comment.

also, don't keep adding it to the cache - the cache() function doesn't
check whether the added value is already present, so we need to do that
manually.

amends 31590c0b65.

Fixes: QTBUG-63452
Change-Id: I608559a80a7c772dbdaacfaaadb4fc268b442c39
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-10-18 10:59:31 +00:00
Qt Submodule Update Bot
4061156381 Update submodules on '5.12' in qt5
Change-Id: Ica33ddf6fa348ed65f7194127c80b6e539462e6a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-18 10:59:28 +00:00
Michal Klocek
b365b3853e Make quickcontrols1/2 and webchannel optional for webengine
Fixes: QTBUG-70784
Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-10-16 13:59:23 +00:00
Heikki Halmet
9573b78b56 Provisioning: Use /dev/null when dealing with passwords
This will prevent passwords showing in provisioning logs.

Task-number: QTQAINFRA-2261
Change-Id: I501fd3be64514c59a604c1116113eaf975208024
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-10-16 13:59:18 +00:00
Jani Heikkinen
0b1493a840 Add packaging feature for MSVC2017 32 bit build
Task-number: QTBUG-63708
Change-Id: Ib7897c5daffa49b014c95db5a6db9d350fe1a5e8
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-10-16 13:59:16 +00:00
Qt Submodule Update Bot
2863cdc7aa Update submodules on '5.11' in qt5
Change-Id: I4327f5eef196cdad0ea41c7e2b8e59ccaa637582
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-16 10:07:34 +00:00
Qt Submodule Update Bot
d30c0366db Update submodules on '5.11' in qt5
Change-Id: I4a586ab957fc68b0afb2334048040e01f398a07b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-13 08:53:14 +00:00
Juha Karjalainen
0ac22704fa Provisioning: Disable powershell quickedit
Powershell quickedit causes powershell window freeze until quickedit
mode is exited by pressing enter. For some reason quickedit mode get's
activated during build. This causes time out as agent does not get
any output from processes.

Task-number: QTQAINFRA-2263
Change-Id: I2878cc7a39bae504f826c5622cc5817fd227d7f0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-13 08:41:42 +00:00
Qt Submodule Update Bot
af7dd645c8 Update submodules on '5.12' in qt5
Change-Id: I93231f063bc3c3d29add8ade27803c8f87572dde
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-13 08:41:33 +00:00
Andy Nichols
80aa7d0018 Update qt3d-runtime platform_configs
Change-Id: I52ad38289e6a4b385a981bcf91933378651eafe7
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-10-10 11:26:02 +00:00
Qt Submodule Update Bot
ab670f1967 Update submodules on '5.12' in qt5
Change-Id: If26ce4b6686cf5a704c9d64298a23159780a39e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-10 04:01:57 +00:00
Qt Submodule Update Bot
e05e24aa18 Update submodules on '5.11' in qt5
Change-Id: I0c458253ebe502ad13b40c6dda619ec9779e675e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-09 13:15:18 +00:00
Tony Sarajärvi
61c4be2c0b Add Android arm64 targets
Task-number: QTQAINFRA-2078
Change-Id: Icbc4fa27932e2a53d43bf1c72ddd2091f2801e5c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-10-08 18:21:50 +00:00
Qt Submodule Update Bot
245815a620 Update submodules on '5.12' in qt5
Change-Id: Ibe3ea201ddcb9c555d458296e0f12fcc03fcf0e2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-07 08:19:45 +00:00
Joni Jäntti
7b9c3ced84 Provisioning: Ubuntu_16.04_x64: Use internal mirror
Currently the internal package mirroring is being enabled only after
the installation of the packages. It should be done before to
actually download them from the internal repo instead of the
official repos.

Change-Id: I4aeb2e463ae804bd2f8ce9536ab89fc26fedbdb5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-05 12:04:46 +00:00
Joni Jäntti
ca36d5b3fa Provisioning: Ubuntu 18.04: Use internal package mirror
Using internal package mirror during provisioning reduces outgoing web
traffic by a huge amount.

Task-number: QTQAINFRA-2213
Change-Id: I6a63b51efbf411a712795a6347c2deeed6ac44d3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-10-04 10:08:47 +00:00
Tony Sarajärvi
e85296ba98 Optimize macOS build targets by removing excess builds
Change-Id: I983f7558dabddf7e91f855dbead6dc0172db127c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-10-04 08:03:27 +00:00
Qt Submodule Update Bot
260d66f94e Update submodules on '5.12' in qt5
Updated qtwebengine once againt to have a fix for getting beta1 out

Change-Id: I3de7ad0916e886722186f09da036ea7a398f363f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-03 17:58:05 +00:00
Qt Submodule Update Bot
f0f31335e9 Update submodules on '5.11' in qt5
Change-Id: If72a35b56e4f1a1c102f60d2db543dd07c525dcd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-03 04:31:14 +00:00
Qt Submodule Update Bot
bc7af0171f Update submodules on '5.12' in qt5
Change-Id: Idb32934a75413896c3a1ea64cd0a69a42d75e9f5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-02 08:11:15 +00:00
Qt Submodule Update Bot
269e38c27c Update submodules on '5.12' in qt5
Change-Id: I1705b1d1b99f4a547bcd6c0c7d17a65f61aea44a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-01 09:10:16 +00:00
Qt Submodule Update Bot
74ab43ba23 Update submodules on '5.12' in qt5
Change-Id: Ib44fb3e8fa52ff72bbe7f92630635a5158a02ed2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-09-30 14:06:37 +00:00
Liang Qi
d58cfd0db9 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Ia649f87c2bc71d9e755b665ef9bc86e2f63f8d0d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-28 05:40:46 +00:00
Tony Sarajärvi
f35067c7c3 Set timezone to GMT in macOS'es
macOS doesn't support UTC, so we'll go with GMT.

Task-number: QTQAINFRA-1641
Change-Id: Ifae9547b010c293c4a2cb18252e8f18961a4456a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-09-27 18:09:38 +00:00
Qt Submodule Update Bot
0e4743cabf Update submodules on '5.11' in qt5
Change-Id: Ie4b2b37794d3cfad7da7c7449d287369c5b6315b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-27 08:57:36 +00:00
Qt Submodule Update Bot
1ce244fec0 Update submodules on '5.11' in qt5
Change-Id: Iff73075fe2038d7d1f7fc0853723004b263e994a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-26 10:30:13 +00:00
Liang Qi
7520be78cf Update submodules on '5.12' in qt5
Exclude qtwebengine in this round.

Change-Id: Iccbd8d5f4f4c016eab24f8b969aa485bb59a1d62
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-26 04:28:05 +00:00
Tony Sarajärvi
a620807118 Move QNX770 from macOS 10.12 to macOS 10.13
Change-Id: I02f0fff983349dd59f2697a050b97b761d04d3b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-24 17:13:22 +00:00
Tony Sarajärvi
f1256e1f39 Switch MinGW to clang in Windows Android builds
Also as target_compiler is a column now, let's
add the missing information about android target
compiler in the rest of the configurations as well.

Task-number: QTQAINFRA-1682
Change-Id: I6de1ea40383512f5fb8b55242f1a1ac264f9d7d6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-21 16:33:36 +00:00
Tony Sarajärvi
00958e9430 Move packaging from macOS 10.12 to macos 10.13
Task-number: QTQAINFRA-2056
Change-Id: I04b0a282beedce15959b416d716b63bd6197b4a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-19 08:18:21 +00:00
Qt Submodule Update Bot
04b1fb9adc Update submodules on '5.11' in qt5
Change-Id: I39b766717891eeeca7da66be4b61937f2dec80dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-18 08:30:08 +00:00
Qt Submodule Update Bot
713ed0c9b8 Update submodules on '5.12' in qt5
Change-Id: Ib09d0026a9427134822303cd05e7f696a5d15a28
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-17 13:04:44 +00:00
Liang Qi
a0d9b4605e Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: Ia69cee4eaced64a0c46123a59918b984ab24317f
2018-09-17 10:47:59 +02:00
Qt Submodule Update Bot
e4b9ccbbde Update submodules on '5.11' in qt5
Change-Id: Ia6d0831b5376b92d8e2a261fe9f5626d3f2fddaa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-16 13:32:19 +00:00
Qt Submodule Update Bot
e59a97be63 Update submodules on '5.12' in qt5
Change-Id: I4f74142bd95c043968a80b75ff4a8d69207595dc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-16 07:54:56 +00:00
Qt Submodule Update Bot
01c2cf3d8c Update submodules on '5.11' in qt5
Change-Id: I7a43072f75fc3ab3fb1814593af0bf6910ac85c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-15 13:02:31 +00:00
Heikki Halmet
0e0d99d617 Provisioning: Support for Webassembly
This change will install specified packages of Emscripten and set up
the build environment for making binary artifacts of WebAssembly

Task-number: QTQAINFRA-1972
Change-Id: Ia5df6c208ea8f29ca8948f0273f321a59fc694a2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-09-15 10:06:47 +00:00
Tony Sarajärvi
c51c0a2b2e Fix shebang on QNX provisioning scripts for Ubuntu 18.04
Change-Id: I74393c3d0382daae9bd1e82a495be19ad2baf90e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-09-15 10:06:43 +00:00
Qt Submodule Update Bot
d25341093a Update submodules on '5.12' in qt5
Change-Id: Ib41f214459b3e5dfc5f509871facc6c2212237ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-15 10:06:40 +00:00
Qt Submodule Update Bot
967d28eed2 Update submodules on '5.11.2' in qt5
Change-Id: Iffc768a304dedfd645219db18ce10fb77515710f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-13 15:33:30 +00:00
Qt Submodule Update Bot
31d989af00 Update submodules on '5.11' in qt5
Change-Id: If048c9cde7b6374c844cba513658564fe476abc1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-13 14:42:50 +00:00
Kai Koehne
6dfe5c31f2 init-repo: Resolve alternate url for git sub-submodules
Do set correct --alternates argument for sub-submodules like
qtwebengine/src/3rdparty. So far these repositories were always
fully cloned from remote (or the mirror).

Fixes: QTBUG-61901
Change-Id: I19f5930a03ab9050b6e62ac5a5c78780d0544e03
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-09-13 08:53:29 +00:00
Liang Qi
dada6497fb Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iac3eb41931081588a08916ddce51dae977c6ef15
2018-09-12 21:50:27 +02:00
Qt Submodule Update Bot
384ca26700 Update submodules on '5.11.2' in qt5
Change-Id: Icf8612cbd19dcd417956ce4d56634e7f5a31369e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-12 19:49:09 +00:00
Joni Jäntti
974884c0d1 Provisioning: Rebase Ubuntu provisioning
Some provisioning changes made to Ubuntu 16.04 didn't make it to 18.04
when the new platform was introduced. These changes need to be included.

Task-number: QTQAINFRA-2210
Change-Id: Ie8c3cfda95abadbd3a416545ebcfbbab8c0cb4ad
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-12 18:16:02 +00:00
Qt Submodule Update Bot
9a7969f76c Update submodules on '5.12' in qt5
Change-Id: I1f0cfca076840b06faf3ed8b606857be3f690e41
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-12 18:15:57 +00:00
Qt Submodule Update Bot
7bc473908e Update submodules on '5.12' in qt5
Change-Id: Icf10a073edbc1dde7868d4390dacd6935c037522
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-11 13:32:30 +00:00
Johanna Aijala
1cad3084a9 Use Squish 6.3.2 Qt5.10 on Qt5.12 RTA tests
Update to latest Squish versions that Froglogic is providing. May need
to update to Squish 6.4 later, but now we use 6.3.2.

Change-Id: I89e1f20b58cdd2e948c8021a5fdc357bfc201db1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-11 13:32:27 +00:00
Joni Jäntti
36dbfa3b97 Provisioning: Add chmod +x to Squish .run file
This file needs execution rights before it can be run in provisioning.

Change-Id: Id49de89e0260b18a71cbcd4f4dc2b5a28e0a9890
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-11 13:32:23 +00:00
Tony Sarajärvi
d038ea6757 Provision GCC 8.2 to Ubuntu 18.04 and set as default compiler
The provisioning scripts supports prebuilt binaries. When available,
those are extracted taken into use. If they are not found,
sources are downloaded and built.

Task-number: QTQAINFRA-2066
Change-Id: Id1a59be2d1cbdb29d316ade572c3ce8f17ad3a6b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-09-11 13:32:20 +00:00
Liang Qi
0a5c08be35 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Id55013815613d188ffaf46d7eb9bdb8c46085898
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-10 13:00:22 +00:00
Liang Qi
e866953948 Merge remote-tracking branch 'origin/5.11.2' into 5.11
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I430b2b99d1ed463d1750c6f1a5955bc0742f4b35
2018-09-10 10:12:36 +02:00
Qt Submodule Update Bot
e95824f59e Update submodules on '5.11' in qt5
Change-Id: I15c5af9f1985ad113fd63c3366bd7f4d8612e4af
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-10 07:38:43 +00:00
Tony Sarajärvi
d038865e65 Fix license text of provisioning script
Change-Id: I542da038dd087b1705d1ceb475a1656eeec84c91
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-08 12:24:09 +00:00
Qt Submodule Update Bot
3a5feff2a2 Update submodules on '5.12' in qt5
Change-Id: I84ed5c723c9c3bef9f509a30502b93af2dde844b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-08 12:23:52 +00:00
Qt Submodule Update Bot
bf0b84a051 Update submodules on '5.11' in qt5
Change-Id: Ie1bf232eae589efe512178d158aef2f3c09a2b7c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-07 05:30:18 +00:00
Qt Submodule Update Bot
d6a82a8416 Update submodules on '5.12' in qt5
Change-Id: Ica545d4ea4639924b24dd6d75ff614075879955d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-07 05:13:44 +00:00
Antti Kokko
6a919fb8f5 Use MinGW73 for building Qt3D runtime QNX targets
Change-Id: I0fc650345dcffe8840f440db74cf4d9d48465bf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-09-06 11:41:52 +00:00
Qt Submodule Update Bot
daae11c62b Update submodules on '5.11.2' in qt5
Change-Id: If0f3dc30be6ad8e10d81c0b8861c9523a07c0894
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-09-06 11:41:48 +00:00
Liang Qi
fd922eb4b1 Update submodules on '5.12' in qt5
Change-Id: Ifda91b5137093a660d23591f1252c4c8f1c2f2c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-06 11:30:35 +00:00
Dominik Holland
7fe274f6f6 Correctly use pip3 to setup a wheel cache for python3 packages on linux
Previously pip was used (instead of pip3) which caused that python2
packages were installed into the python3 wheel cache folder. Some of
the packages also worked for python3, but not all of them.

Task-number: AUTOSUITE-195
Change-Id: I393d036667b14e11dee65975ba6933e7174d0e9d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:59 +00:00
Qt Submodule Update Bot
db7391647f Update submodules on '5.12' in qt5
Change-Id: I16bee67a353e15b2d30207eb3c0979d25a449b5c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-05 05:53:54 +00:00
Joni Jantti
83f6543be8 Provisioning: Move Android NDK to macos 10.13
Task-number: QTQAINFRA-2158
Change-Id: Iddf3bd2609e6b06b33cbe2258075157e91e52e8e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:51 +00:00
Joni Jäntti
ccc960b6be Provisioning: Ubuntu 18.04: QNX700 and QNX660
RTA testing needs QNX platforms installed on Ubuntu 18.04 as well.

Change-Id: I8cf95dc5eb12761f82081bfda0973cc19a2864bc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:47 +00:00
Qt Submodule Update Bot
040ca5e267 Update submodules on '5.11.2' in qt5
Change-Id: If055dba4544826db368e5d46bb8d6b622e08d892
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-05 04:40:45 +00:00
Qt Submodule Update Bot
72505cc55b Update submodules on '5.11' in qt5
Change-Id: I35ae3d03cfa8f5dd202218ffb7d2f0057eb41660
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-04 21:30:42 +00:00
Qt Submodule Update Bot
b9b8066d97 Update submodules on '5.11' in qt5
Change-Id: I89b673b1078c0ffab7e4710b2718008c46127bad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-04 08:45:49 +00:00
Liang Qi
75e33d94bd Update submodules on '5.12' in qt5
Change-Id: I48c73c56b339a8e28b7c1641f3160aa8febf188d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-04 08:29:11 +00:00
Tor Arne Vestbø
b5a989133a Version Xcode application bundle when provisioning macOS images
By versioning the Xcode installation we open up for having multiple
Xcode versions installed on the same image in the future, which
allows for e.g. choosing the Xcode version in the build config.

By running xcode-select to choose the bundle, we ensure that
build steps that do not know that Xcode has been versioned
will still pick up the right compiler and SDK paths when
e.g. running xcrun -find clang.

Done-with: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Change-Id: I0bd877bd344cebdd1fbf3a3035b00069f75c4c96
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:08 +00:00
Maurice Kalinowski
61ce2045be Provisioning: Add mqtt broker to Ubuntu 18.04
The broker is required to run tests of the mqtt module.
This is a followup of e89420945f which
was missing this part.

Task-number: QTQAINFRA-1983
Change-Id: Ibcc79aecbf1212ecc64150c911ecf296c7f58e19
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:05 +00:00
Tony Sarajärvi
7d0c343fc6 Cleanup of RHEL 6 codes from provisioning scripts
RHEL 6 has been removed in 5.12+ verifications, so no need
to maintain those changes.

Change-Id: Ie65120bf8ec7a7d0aaa71b7c28e95283263e62eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:01 +00:00
Tony Sarajärvi
413fcafc14 Change 'test suite' in license headers of prov scripts
Change-Id: I9687bcb15b26287ea6eeb2098079137d6e3fc288
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-04 08:28:58 +00:00
Joni Jäntti
7cbb032dc5 Provisioning: Fix vclib path on x86 machines
The path was incorrect for x86 Windows machines since they use "Program
Files" without the "(x86)" suffix.

Change-Id: Iecfee3b568a4d23b056fab230891f7eeb4d63cc8
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-09-04 08:28:55 +00:00
Liang Qi
c478262c26 Update submodules on '5.11.2' in qt5
Change-Id: Iebe3db08c265da0185b58c67aeae3765f8eb5616
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-03 19:38:40 +00:00
Heikki Halmet
c870b9b13f Provisioning: Disable mlocate from linux
No need to update the locate database

Task-number: QTQAINFRA-2099
Change-Id: Iae8bf26e4b04ff9c287e9e3f4cc6f492e74355e4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:37 +00:00
Heikki Halmet
967129344a Provisioning: Remove update-manager
Task-number: QTQAINFRA-2104
Change-Id: Ieaf0801099d8c90821c2b8d9db7da47730fd8abb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:34 +00:00
Heikki Halmet
cd9b6276b8 Provisioning: Disable Cracklib-runtime
Task-number: QTQAINFRA-2104
Change-Id: I784fa1b3d8c98d765bfdea929fdb494ca63e09d3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:32 +00:00
Liang Qi
2e6a5787ef Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: I74de8fc02d0c0295dc7746defe11bed50fb0ba5e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-31 13:37:51 +00:00
Frederik Gladhorn
8b4d267af7 Add Fixes: tag to commit template
Change-Id: I2ad6829901be73bd18a8785c2bee3acd3ba20bcc
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-08-31 08:35:56 +00:00
Frederik Gladhorn
5872e22f31 _clang-format: indent initializers with four spaces, not eight
Change-Id: I9fc644554bd326a3a54163072b7b9e06253a5ff2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2018-08-30 09:09:28 +00:00
Antti Kokko
f70c304b5e Add qt3d-runtime targets
Task-number: QT3DS-2126
Change-Id: Ibce83cbd513bc0083ac149ed453fc9eb217c1d7a
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2018-08-30 08:35:36 +00:00
Liang Qi
1b65a5d73a Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098
2018-08-30 09:50:50 +02:00
Joni Jantti
e89420945f Add Ubuntu 18.04 to the CI
Qt 5.12 will have both 16.04 and 18.04
LTS releases verified. Some configurations
are upgraded from 16.04 to 18.04.

Task-number: QTQAINFRA-1983
Change-Id: I1b5c2a1c23ce209040b3478cff21b7f6436a9b54
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-30 04:53:50 +00:00
Qt Submodule Update Bot
5a2a93ddf4 Update submodules on '5.11' in qt5
Change-Id: Ibde23ec3cee72507c530db0e00c9037d84768890
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-29 21:30:44 +00:00
Frederik Gladhorn
e470da9d65 Make xmlpatterns depend on declarative
After moving the xmllistmodel into qtxmlpatterns we can reverse the
dependency. This will improve build times and cleaning up dependencies
makes sense in any case.

Change-Id: I560d51ee47167a0cb519b98a15e6eb9199b4cd79
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-29 05:50:07 +00:00
Liang Qi
cf405ea20e Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: Iad9c2862709be91155a9a72af77fb769528768cc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-29 05:50:00 +00:00
Liang Qi
2b2a639fb9 Unify the iOS/tvOS/watchOS builds in default.txt
Then we can save more virtual machines.

DebugAndRelease V.S. Release(build time):

qtbase
* iOS static: 14min, 57s : 11min, 35s
* tvOS: 17min, 24s : 9min, 38s
* watchOS: 16min, 36s : 9min, 46s

The longest ones, some win10 builds, are about 40 min. And the
longest ones for tests, are about 1 and half hours.

qtdeclarative
* iOS static: 19min, 10s : 12min, 19s
* tvOS: 20min, 35s : 12min, 55s
* watchOS: 15min, 17s : 9min, 59s

qtwebengine
* iOS static: 12min, 48s : 4min, 14s
* tvOS: 6min, 6s : 4min, 10s
* watchOS: 6min, 21s : 6min, 13s

Change-Id: I51618683de8ed0826120b8baaef1e2e11473283a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-28 19:02:05 +00:00
Qt Submodule Update Bot
7b029c8ca2 Update submodules on '5.11' in qt5
Change-Id: I37c29f60c68926fc6cd8b02d06ea139675f6c80e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 19:02:01 +00:00
Tony Sarajärvi
3044d0d454 Enable autotests on macOS 10.13
Task-number: QTQAINFRA-1301
Change-Id: I65680f2a0fd42b7473da05f71a8f1cb3d733a360
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 16:29:52 +00:00
Liang Qi
e999cc7df9 Move iOS/tvOS/watchOS build host to macOS 10.13
Task-number: QTBUG-70180
Change-Id: I6b4b90883cccfdaedbeb0440b62a1b8290655838
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-28 05:05:48 +00:00
Liang Qi
02336a3ac0 Provisioning: need to install packages in Xcode
Task-number: QTBUG-70180
Change-Id: I23134b887bf7fa05e29bd16769fdb9c7f025764e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-08-28 05:05:44 +00:00
Liang Qi
5f57766742 Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: I1a4a5cbf3817b40e47701fdc5a0f6f4df18633c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 05:05:41 +00:00
Frederik Gladhorn
b54ad48585 Merge remote-tracking branch 'origin/5.11' into 5.11.2
Change-Id: I376800d8d095d483bbf5342d90fc5e013415e59a
2018-08-27 15:54:13 +02:00
Simo Fält
d0d326dddd Replace MinGW 5.3.0 with 7.3.0
Task-number: QTQAINFRA-1289
Task-number: QTQAINFRA-1389
Change-Id: Ic6f637170cd4b98ece45811e66dbb21dc3ee66e3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-26 19:16:55 +00:00
Heikki Halmet
a2289e9b4e Provisioning: Change mesa_llvmpipe to use ci-files01-hki as primary url
This will reduce download time

Task-number: QTQAINFRA-2170
Change-Id: I8313764f7d440e2300a8efabfe4e4226a591d339
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-25 07:09:14 +00:00
Heikki Halmet
32fcfb08ce Provisioning: Change jom to use ci-files01-hki as primary url
This will reduce download time

Task-number: QTQAINFRA-2169
Change-Id: If36ac57daa7066cdd97d5d893a105b812e0eee18
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-25 07:09:11 +00:00
Qt Submodule Update Bot
6945c8487c Update submodules on '5.11.2' in qt5
Change-Id: I63679cff0e7469b9483e521dfa5f59d355e6562e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-25 07:09:07 +00:00
Tony Sarajärvi
5745c4da94 Cleanup of unused macOS 10.10 provisioning scripts
Change-Id: Iae988527c2ed9a27bb724072064cd6d1dcd55f08
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 18:24:57 +00:00
Maurice Kalinowski
ba5211d85f Provisioning: Fix open62541 on msvc2015 x86/x64
The correct vcvars resides in Visual Studio 14, not 12.

Change-Id: I89e75b4c5c7806ac451f645b3bf341f588818040
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-08-24 18:24:53 +00:00
Simo Fält
0125d70806 Provisioning: Disable spotlight in macOS
While the VM we launch is a clean image the spotlight starts indexing
right after the boot. That seems to require quite a lot of resources.
Build machine doesn't need the feature, so we are disabling it.

Change-Id: I2c5f0030d7a687cfbded4e9bd4da70302cb0a933
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 18:24:50 +00:00
Simon Hausmann
9a7555e54d Fix failing assertions in QML when running under qemu
Unfortunately the user-space emulation mode of qemu does not implement
MADV_DONTNEED, which is a feature that the garbage collector of QML
relies on. Patch is submitted to the qemu list and included here to fix
the imminent issue we're seeing.

Task-number: QTBUG-68349
Change-Id: I2bb15513a1e5a7ad03eeae98d77691336985a20f
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-08-24 18:24:47 +00:00
Qt Submodule Update Bot
c620015aac Update submodules on '5.11' in qt5
Change-Id: Icfc06ccf7128083957edc4478cd810cbb259186c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-24 07:22:49 +00:00
Tony Sarajärvi
096780db16 Drop testing of macOS 10.11 in the CI
The 10.11 configurations were bumped to 10.12 configurations.
The 10.12 packaging configuration will be deleted once autotests
have been enabled for 10.13 and packaging moved to 10.13 cross
the board.

Task-number: QTQAINFRA-2055
Change-Id: I17c598a306487e9a2f72006c3fa02e4ee683ee12
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 06:50:09 +00:00
Qt Submodule Update Bot
4b2a2d2d92 Update submodules on '5.12' in qt5
Change-Id: I82cbc9879fd675685e3ac4eb4b368f975c2a27a1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-24 06:50:05 +00:00
Liang Qi
2a439be756 Update qtbase manually
Change-Id: Ic48eee5dcf4b6f05713a6ab04c39cfcb6baa8bef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-23 14:36:48 +00:00
Simon Hausmann
cdb1230145 Manual update of just qttools to pull in libclang build fix
Task-number: QTBUG-69793
Change-Id: I9852567a5268be62b45f605bc0e7a0248278c931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-23 09:28:59 +00:00
Simon Hausmann
1e9fb7f9d9 Prospective fix for build of qttools on Windows with QNX target
This modules contains qdoc as a host build tool, which needs to be built
with MinGW 7.3 as host compiler in order for the libclang linkage to
succeed. That linkage is forced via QDOC_USE_STATIC_LIBCLANG, which is
set on the Windows 10 machine.

Task-number: QTBUG-69793
Change-Id: I2f0ce81c58ae049d9d59559dfe4f457d082cc98d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-08-23 09:28:56 +00:00
Heikki Halmet
3dd549d618 Provisioning: Fix activate of static linking for libclang
Task-number: QTBUG-69793
Change-Id: Ib5151e16d0e040a63a3f7fce054f2fad6abb2b6d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-23 09:28:51 +00:00
Qt Submodule Update Bot
c3e5f325bb Update submodules on '5.11' in qt5
Change-Id: I4f4c59dc396299e2c6a398521174e91cc7cac2ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-23 09:27:34 +00:00
Qt Submodule Update Bot
f35a0cb742 Update submodules on '5.11' in qt5
Change-Id: I4195ceeeefeb98c8d600b86079f986d2d18e6884
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-22 04:31:17 +00:00
Qt Submodule Update Bot
6b6f337925 Update submodules on '5.12' in qt5
Change-Id: Ie06d6075cf0f157f892e829dabdf5890a646b4ce
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-21 15:13:59 +00:00
Qt Submodule Update Bot
79c3ea18ed Update submodules on '5.11' in qt5
Change-Id: I3b4d492fcaca7b1519fea144a944aefda68299ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-21 10:37:49 +00:00
Liang Qi
5360fc7fcf Merge remote-tracking branch 'origin/dev' into 5.12
Change-Id: I593555fd39b6499d241acb00cc656bcdbef83d77
2018-08-21 09:26:11 +02:00
Tony Sarajärvi
92088b295c Upgrade Xcode to 9.4.1
Task-number: QTQAINFRA-2136
Change-Id: I57f64c3dc3b91f21bb6d42ab5dc5163db75120b9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 19:02:25 +00:00
Qt Submodule Update Bot
6c225347aa Update submodules on '5.11.2' in qt5
Change-Id: I34da23765b048c8e3348d6ac05b18598bfefcd83
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 16:16:31 +00:00
Liang Qi
42f4bdd051 Update submodules on 'dev' in qt5
Change-Id: I15b2964fb22fdac38f172b2a24852fb90a255649
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 15:47:47 +00:00
Oliver Wolff
f8086955b3 Provisioning: Install debug version of vclibs for UWP usage
RTA relies on the availability of debug vclibs. The frameworks are usually
installed on first usage by Visual Studio, but as we use winrtrunner, we
have to install the packages manually.

Task-number: QTBUG-69809
Change-Id: I66cc4b04062afe634345cddc8ab4d001778274cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-20 13:23:49 +00:00
Qt Submodule Update Bot
8a559f20e3 Update submodules on '5.11' in qt5
Change-Id: Id6f78adf7c0c3f455b798ad1bc80c7097b519e0b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-18 20:52:25 +00:00
Joni Jantti
6077565b3e Provisioning: openSUSE_42.3: Wait for PackageKit to finish
Provisioning sometimes fails if PackageKit is locked at the moment we
try to remove plasma5-pk-updates package.

Task-number: QTQAINFRA-2141
Change-Id: I5e6c2ecab87033ce01aae915813e1d5f70ea8186
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-08-17 16:01:57 +00:00
Maurice Kalinowski
21b3591580 Provisioning: Update MQTT broker
Required to get shared subscription testing working, namely to fix
https://github.com/eclipse/paho.mqtt.testing/issues/56

Change-Id: Ib8657cde0d8e33135bbc2ebcb9558f8e6b13e40f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-08-17 16:01:51 +00:00
Qt Submodule Update Bot
50ef5744f5 Update submodules on 'dev' in qt5
Change-Id: I3968edabb171ffaf9d498f8aaad90843a04fb9ee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-17 16:01:48 +00:00
Oswald Buddenhagen
e49e7fc8ad Adjust submodule branches
Change-Id: Ie460cb41d050c1b73e71278469a8231e294db3e3
2018-08-17 16:03:52 +02:00
Oswald Buddenhagen
31590c0b65 set QTDIR_build in .qmake.super
this suppresses license checking in default_pre.prf in the super module.
submodules set it via their .qmake.conf's.

Change-Id: Ic3599613140169eeacb48385be8f324c4bef8f1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-08-17 13:57:40 +00:00
Qt Submodule Update Bot
d4479f59f8 Update submodules on '5.11' in qt5
Change-Id: I78af59a68a665f7dec71495a58bf4c2e9e23ade3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-17 11:13:36 +00:00
Liang Qi
530a923e68 Update submodules on 'dev' in qt5
Change-Id: Ibc222c15fe9a02dd4ed34fb3cd4724180bb45680
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-17 07:17:36 +00:00
Qt Submodule Update Bot
82401c04df Update submodules on '5.11' in qt5
Change-Id: I4c4d079e17fbab5d98b35a9f9311052ac036bb64
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 18:42:31 +00:00
Liang Qi
02b7a0b984 Update submodules on 'dev' in qt5
Change-Id: Ibe68c18b979b20890cfcbfdbedb1620f7914bba4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 17:50:20 +00:00
Qt Submodule Update Bot
c8016c0093 Update submodules on '5.11' in qt5
Change-Id: If4f598db669ad39d1a0f1042d3666a548aeb3370
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 04:16:53 +00:00
Liang Qi
c00f007d32 Update submodules on '5.12' in qt5
Exclude qtbase in this round.

Change-Id: I0b4c1359b5f5016a1732a290d8e0affa50182e69
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 08:16:58 +00:00
Liang Qi
ab25e989b1 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: I9b781f1add1dea2723e799928db253720b1f2bbd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 08:11:25 +00:00
Liang Qi
726cfcb376 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: I5cc23b431b7a02ad81bba67af3b124b169f02507
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 06:07:22 +00:00
Qt Submodule Update Bot
53a457820c Update submodules on '5.11' in qt5
Change-Id: Ie97b7d21aeb8326256943a646dce4271405f6982
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-15 04:31:14 +00:00
Ryan Chu
23560769c1 Provisioning: Update QEMU toolchains of boot2qt
Docker-based test server needs mdns to resolve .local while testing qt
network stack in CI. Otherwise the tests would not see announced
services.

Relates to yocto/meta-boot2qt 7608ebe44f65f4d525081cf9a5b12cfa05792a8f

Change-Id: If834b01668bcf844e475e863eb1337849c718270
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-08-14 21:08:29 +00:00
Oswald Buddenhagen
8b46f403c8 Adjust submodule branches
Change-Id: Ia24ec2ff93495eed938c5dddab83934327ced02e
2018-08-14 13:00:09 +02:00
Qt Submodule Update Bot
ff39808a80 Update submodules on '5.11' in qt5
Change-Id: Ic2fbb75fb89fe0d5ef8204a0ca56dbb8c20aa47d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-12 08:50:46 +00:00
Liang Qi
013d1fd540 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: Ie6f33cfdba6f17c105660263c444a7386561d038
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-11 21:01:28 +00:00
Qt Submodule Update Bot
c5d9951e7f Update submodules on '5.11' in qt5
Change-Id: If6a2c0aaa5d8c906c5b128780e96e287229b0aa8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-11 11:25:52 +00:00
Qt Submodule Update Bot
f785a27eac Update submodules on '5.11' in qt5
Change-Id: Idc7f48f35f25f8b9373aee159ebf742338bc5a50
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-10 12:48:24 +00:00
Maurice Kalinowski
bc644fd6c9 Provisioning: Update Open62541
Change-Id: I1a1402f80d31d6063cca1838e0b7c3ebbe2d876c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-08-09 13:30:16 +00:00
Joni Jantti
bb6a91d5d4 Provisioning: PyPFD2
Required for QSR documentation.

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>
2018-08-09 13:30:11 +00:00
Joni Jantti
33276c1719 Provisioning: Win10_x64: Remove MS Zune Appx packages
Windows 10 has these Zune Audio and Zune Video packages installed that
often open up automatically when accessing the VMs through VNC for
example. Removing the packages gets rid of this annoyance.

Task-number: QTQAINFRA-2121
Change-Id: I09aa276fcb06ad84321709e64bcfd71fbd33c657
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-09 13:30:08 +00:00
Joni Jantti
19f1bf803c Provisioning: OpenSUSE_42.3: Set GRUB_TIMEOUT to 0
Setting the grub timeout to 0 will save us some time during the bootup
phases.

Task-number: QTQAINFRA-1703
Change-Id: I6dc6fbac0cfe54608068531eba4808cf87cf435c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-09 13:30:06 +00:00
Liang Qi
27c5523b3d Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: Id70accc133763b3570c19630e7161215f326fd84
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-09 13:30:02 +00:00
Qt Submodule Update Bot
fe66f9a927 Update submodules on '5.11' in qt5
Change-Id: I5513ef5d623e23ec68934cf129efa60eeee58bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-09 01:34:03 +00:00
Simon Hausmann
76d922b211 Add soft qtdoc => qtquickcontrols 1/2 dependency
The photoviewer demo imports QtQuick Controls 1 and the coffee demo
imports Qt Quick Controls 2. This is a run-time dependency for dynamic
builds, but for static builds it becomes a build time dependency.

Change-Id: Ie8d7dcf85c2dfe93033fa9254ee350fb654475c3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-08-08 14:13:28 +00:00
Oswald Buddenhagen
0a65cf0e9c add soft dep qtdoc => qtmultimedia
at least the maroon demo will use the multimedia module if available.

Task-number: QTBUG-69823
Change-Id: I7e0f7103aaf1a33a755b9a362274273a9b997f37
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Alexander Shevchenko <sav_ix@ukr.net>
2018-08-08 10:21:09 +00:00
Ryan Chu
4ece0e74ef Update provisioned boot2qt version from 2.3.1 to 2.3.4
Docker-based test server needs mdns to resolve .local while testing qt
network stack in CI. Otherwise the tests would not see announced
services.

Relates to yocto/meta-boot2qt 2f17ab34687ef100c4390057dd220ab431ec8ff8

Change-Id: I5313fc34634211ae6950769518c68c2b11d77eb3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-08-08 10:02:53 +00:00
Qt Submodule Update Bot
1b7b7b363f Update submodules on 'dev' in qt5
Change-Id: I0dec993ba45ada4bf0d5e8f95d511f85b3c8246b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-08 09:28:48 +00:00
Qt Submodule Update Bot
5088f70e7c Update submodules on '5.11' in qt5
Change-Id: I990522ab7bca86409285b39aa6a9e5d74df9653c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-08 07:50:49 +00:00
Joni Jantti
07e349546c 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>
2018-08-07 18:11:43 +00:00
Qt Submodule Update Bot
7c6f78a52e Update submodules on '5.11' in qt5
Change-Id: I670025f9dbbdcaa67f211fb6f5dd616b1a428b1c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-07 08:37:14 +00:00
Liang Qi
d746bc3ea8 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
2018-08-06 11:31:33 +02:00
Qt Submodule Update Bot
a43a23f7d1 Update submodules on 'dev' in qt5
Change-Id: Ibe8b3b0b97289dff2dd8b91a25028e0aa53875ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-06 07:45:07 +00:00
Qt Submodule Update Bot
a4654e2aaa Update submodules on 'dev' in qt5
Change-Id: I890f8b105ff51503737f757cf4d681d5029b22a1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-05 15:27:19 +00:00
Qt Submodule Update Bot
00730d1caf Update submodules on '5.11' in qt5
Change-Id: Ibe011d723e946afb21d6631ba0b6c9ef25aa9e43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-05 15:27:11 +00:00
Kai Koehne
8646f7cf9e Remove outdated archive names from README
There are no distinct commercial and opensource source archives anymore.
Some people do also build from git, so adding the archive name
here is just misleading. Given that users read the README, they arguably
should know already where the sources are ...

Change-Id: I42aac84cd0c904b7b6f2dbb19cacf8b3021f6b21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-08-04 12:12:11 +00:00
Maurice Kalinowski
53f4bb2d92 Provisioning: Update MQTT test broker
Updates required for latest MQTT5 features and fixes.

Change-Id: I63e967efafbe1b22800e338b6c431febe3389a45
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-04 12:12:06 +00:00
Maurice Kalinowski
f2fae0b7b1 Provisioning: MQTT: Switch download order
We should try the internal ones first.

Change-Id: Id0bb3c00e0a1359004f66435a452c30ee4997689
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-04 12:12:00 +00:00
Qt Submodule Update Bot
814b318048 Update submodules on '5.11' in qt5
Change-Id: Ic787c30a4a0654d4f0cd8fd484ff9ce0247e0030
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-04 12:11:55 +00:00
Joni Jantti
aeb39be740 Upgrade Android NDK to r16b and switch to clang
We need to upgrade the Android NDK version
when we switch to building with clang.

Task-number: QTQAINFRA-1681
Change-Id: Ic43b28ead393ec5828b099727182df5f4424f419
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-04 05:06:22 +00:00
Qt Submodule Update Bot
a97bea0821 Update submodules on 'dev' in qt5
Change-Id: Ib23bce6910ad849e3dc3d70cbc2fd042071c5c6c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-03 18:49:58 +00:00
Fredrik Orderud
d60ef0b202 Remove broken qtquick1 submodule
This submodule have not been maintained in several years. Building currently
fails due to qtquick1 not being in sync with interface changes in qtbase. I
think it's therefore better to just remove the submodule altogether. That way
we stop causing problems for external developers wanting to build Qt from
source.

Task-number: QTBUG-69725
Change-Id: I905888d99f510be12c484f7da52986c9b1e9478f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-08-02 19:33:13 +00:00
Tony Sarajärvi
0bdbc37b43 Only update qtserialport
For a fix on Android.

Task-number: QTBUG-69727
Change-Id: Ie7d000dece247678e80c7d7db08c0ac3763bc8a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-02 18:31:04 +00:00
Qt Submodule Update Bot
51ea6f2895 Update submodules on '5.11' in qt5
Change-Id: I43f504b9f30ce021fc38f7115cbc7d61d9b9d790
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-02 01:33:00 +00:00
Tony Sarajärvi
37ad6b0144 Use local Ubuntu repositories with Ubuntu 16.04
Using cached local repositories saves us outgoing
bandwidth. This way we also get version pinned packages.

Change-Id: I475c62c3e408d71e85f24d74dd384c62de583403
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-08-01 14:51:15 +00:00
Qt Submodule Update Bot
781d243f89 Update submodules on '5.11' in qt5
Change-Id: I3989272610c8c491f9c3a989e79cae36ad036d88
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-01 11:11:55 +00:00
Frederik Gladhorn
b6fd915b26 Remove packagekit (update notifications) from RHEL 7.4
PackageKit and gnome-software run in the background and at some point
will show popups to ask the user to update.

Change-Id: I99a3314c8788c7cc06e479718306a822bf255fbd
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-07-31 15:09:08 +00:00
Simon Hausmann
21995a6158 Fix dependencies of the qtdoc module
After commit 01d2f35b6988edacc741b358703d16d4cd8c199a in qtbase, the
existing CONFIG+=lrelease in examples/demos/photoviewer/photoviewer.pro
now calls lrelease and thus requires qttools.

Change-Id: I7cabc70fc6316a49793d7e91a493d8a5e5028295
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-07-31 14:36:44 +00:00
Dominik Holland
f9f9e0944d Download and cache needed python wheels during provisioning
Instead of downloading the packages during the compile/configure
step setup a wheel cache folder during the provisioning phase

Task-number: AUTOSUITE-195
Change-Id: I465f1be7cdd351e7680dcd8ae22d5e97ddf8cb2d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-07-31 14:36:41 +00:00
Qt Submodule Update Bot
f128708e34 Update submodules on '5.11' in qt5
Change-Id: Ie6ec2358ba3df679b0d7bc30f9c17935fc19993b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-31 05:12:39 +00:00
Qt Submodule Update Bot
fc44b43851 Update submodules on '5.11' in qt5
Change-Id: I620723f0983da8a0bf8e19348a6a0be2d02c1341
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-30 19:56:26 +00:00
Qt Submodule Update Bot
d16c0d2675 Update submodules on 'dev' in qt5
Change-Id: Ic321b9e43d8e744049142b01d40728460f5722f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-26 09:11:43 +00:00
Qt Submodule Update Bot
dc406ec87e Update submodules on '5.11' in qt5
Change-Id: I7ad748481565042891e28dc17385e8229ea18c73
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-26 07:53:33 +00:00
Qt Submodule Update Bot
c8d7e38778 Update submodules on 'dev' in qt5
Change-Id: I0b014bee5ef1621a1dc3c02571ba0aff52d8cf2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-25 09:36:09 +00:00
Qt Submodule Update Bot
c00bed4a42 Update submodules on '5.11' in qt5
Change-Id: I77c1b4607fc857de5c9ee9abfa8e81f4bc8f0e0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-25 09:35:47 +00:00
Qt Submodule Update Bot
11851f418b Update submodules on '5.11' in qt5
Change-Id: Ie65a8302aa83a5c7c83c5c4ca2debcb9fe116e3c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-24 08:49:34 +00:00
Qt Submodule Update Bot
cd852d51eb Update submodules on 'dev' in qt5
Change-Id: Ie9f30b588c9f959f049f1f3b0830ac2894f284ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-24 07:41:11 +00:00
Simo Fält
a7a31600b4 Provisioning: Update cmake to 3.11.3 on macos
It seems that cmake 3.6 had issues with more recent XCode. Since XCode 8
the sysroot folder might have been unversioned (MacOSX10.12.sdk ->
MacOSX.sdk). In that case older cmake can't detect correct SDK
version. This is causing issues when building Pyside2.

Change-Id: I09f0ed4fe6d15ba3d60aa3a6e9a9b3b9091996c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-23 20:19:30 +00:00
Qt Submodule Update Bot
34e0a56144 Update submodules on '5.11' in qt5
Change-Id: I681548a12fec32f415694bc6a397a202c876e8e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-23 07:16:15 +00:00
Qt Submodule Update Bot
60cdf0d303 Update submodules on 'dev' in qt5
Change-Id: Icd056ebc3efef5427b9bfd7ad8fc568855155ad0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-23 06:12:15 +00:00
Qt Submodule Update Bot
231446f684 Update submodules on 'dev' in qt5
Change-Id: Ic9ee5417a89c9a83e6b65d2b33c3fea37dfc9245
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-22 08:31:45 +00:00
Qt Submodule Update Bot
edbd24972f Update submodules on 'dev' in qt5
Change-Id: Ib375f5182203ae1217586bd95bb3a6e0c47429bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-21 11:58:00 +00:00
Qt Submodule Update Bot
5e45a7a26e Update submodules on '5.11' in qt5
Change-Id: I1532481ce8b85e25058b580308c44f531141f1a3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-21 11:57:53 +00:00
Qt Submodule Update Bot
78a597f987 Update submodules on '5.11' in qt5
Change-Id: I27d4627770309abe7a9393e411c82e7ea414b766
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-20 06:50:14 +00:00
Qt Submodule Update Bot
5bd70863f6 Update submodules on 'dev' in qt5
Change-Id: I46590a04c487498f6118cf17bd06114680e4493c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-20 06:49:42 +00:00
Frederik Gladhorn
9cd9258b8b Move _clang-format from qtrepotools
Change-Id: I9ccacaf6ed09bbc0ee3f55bf6f97d96976341d14
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-07-19 12:15:55 +00:00
Qt Submodule Update Bot
b9bc0d8a10 Update submodules on 'dev' in qt5
Change-Id: Idccb3051f2d430ff7b353bc1c8aee341d1314d84
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-19 11:02:13 +00:00
Maurice Kalinowski
44280782ed Open62541 win32: Add python to dev environment
The autodetection of cmake used a different python for x86 builds of
msvc. Those did not have six installed. Instead, use one python for all
build variants to stay consistent.

Change-Id: Id1ad2bc320e47a68358364ff94d78993ba0b0848
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-18 18:30:37 +00:00
Qt Submodule Update Bot
743843bddb Update submodules on '5.11' in qt5
Change-Id: Iac05412210fa6030234b450d87d5b15543fdbbb5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-18 12:55:22 +00:00
Qt Submodule Update Bot
c87e4754b2 Update submodules on 'dev' in qt5
Change-Id: I93cf04ca1ecec20b61cac9275b719ebd3e76c227
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-18 09:30:32 +00:00
Simon Hausmann
344a384030 Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-07-12 09:46:06 +00:00
Andy Shaw
c1fcf7c1ad init-repo: Allow sub-module checkout path to differ from config name
Change-Id: I622a8ed5daee59a96f4c6c28cc8c5e4d20b88f58
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-07-10 15:23:41 +00:00
Ryan Chu
e99fe6b354 Docker Provisioning: Install Avahi and enable mDNS service discovery
The challenge of connecting Docker containers from the host is to
resolve a predefined hostname to an IP address assigned at runtime. For
Unix-like platforms such as Ubuntu, it can be done by either hard-code
the IP addresses or creating a DNS server. Both of them are not
user-friendly which need root permission to modify system files.

Avahi is a free Zeroconf implementation and provides multicast DNS
(mDNS) service discovery. It enables Docker containers to publish their
services on a local network. For the host systems supporting mDNS
technology, they will automatically discover the services in a local
domain without extra user-efforts.

Task-number: QTQAINFRA-1686
Change-Id: I1ef464a455cef5d331a3e2eb0194e2741172ef95
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-07-10 14:55:18 +00:00
Simon Hausmann
5913addf85 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1af773187b7dd55bf820ce7d3218a9f3121c198a
2018-07-10 09:11:31 +02:00
Oliver Wolff
c2c2a14091 provisioning: Update winrtrunner
winrtrunner is from dev. The only change to the previous version is a
longer timeout for deployment, as CI runs now and then failed, because
deployment did not finish in time.

Change-Id: I244e68af447db9298d64bb791048032edd3ec1fd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-09 20:03:32 +00:00
Maurice Kalinowski
4869ad6a49 Provisioning: Update Open62541 install path
Use the updated install path for OPEN62541_PREFIX argument in CI.

Change-Id: Ifa06d002516da20001a94ff6e7066504fa471a8f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-07-04 12:03:37 +00:00
Maurice Kalinowski
7c14e7a5cc Provisioning: Open62541 Update environment variables
Using CI_OPEN62541_<compiler>_<arch>_PREFIX is more verbose.

Change-Id: I58ed0f31935308389f274f93578361db3dc01daa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-04 12:03:21 +00:00
Maurice Kalinowski
9f57c8135a Provisioning: Install Unified Automation C++ SDK on Windows
UA C++ SDK is one of the supported OPC UA backends in the Qt OpcUa
module. The aim is to have packages available with Qt 5.12.

Change-Id: I2d1b3c6c583f4563e7470317d4f73f853bd34c72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-07-04 12:03:06 +00:00
Qt Submodule Update Bot
d92fc36d32 Update submodules on '5.11' in qt5
Change-Id: I789b8631db8db928a08443bb507b5f18d0e49241
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-07-04 05:10:04 +00:00
Qt Submodule Update Bot
54c23f97c6 Update submodules on '5.11' in qt5
Change-Id: Idc7f66cc084706ac4a2bb9a212af764d41301182
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-07-03 06:43:44 +00:00
Ryan Chu
2b6f5f165d Provisioning: Install Docker-based test servers on Ubuntu 16.04
Build and cache docker images based on the configurations in testserver.
1. Download and install the docker engine and docker-compose extension.
2. Append address and hostname of test servers to CI environment.
3. Build and tag the docker images by the SHA-1 of server context.

Task-number: QTQAINFRA-1686
Change-Id: Ib9b58d45856682ddec04af045e1eab18e14a85fb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-07-02 19:20:21 +00:00
Liang Qi
c6d9e433df Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh

Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
2018-07-02 13:12:35 +02:00
Qt Submodule Update Bot
a37b78293b Update submodules on '5.11' in qt5
Change-Id: Ie3dfab4426573c7c9a3312f40cb349cf8b49938f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-02 07:25:45 +00:00
Qt Submodule Update Bot
3e044c71b9 Update submodules on '5.11' in qt5
Change-Id: Icb4cd2f6afe9a7aa4c3000a7006471afd141f562
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-30 08:01:50 +00:00
Simon Hausmann
0a2b499cca Remove unused libclang installations
We don't need to install the MinGW builds of libclang 6.0 for
configurations where the Qt MinGW build can't use them.

Task-number: QTBUG-68064
Change-Id: Id9183ccfc15a7a81edb67df371075d584e5cbae8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-06-29 13:37:38 +00:00
Heikki Halmet
ecb01d283c Provisioning: Fetch icu from ci-files01 instead of master.qt.io
Change-Id: Ia27e68cb94ab0744ce11cfa74c90e118c1f0e4b3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-29 13:37:36 +00:00
Heikki Halmet
74fd490884 Provisioning: Add force option when unmounting squish
Sometimes unmount of squish fail because resource busy even if
the installation is already succeeded. To avoid this let's add force
option to make sure unmounting works every time.

Task-number: QTQAINFRA-1964
Change-Id: Icacd01341d09577d9880e3ed208cb6ea18a7ac4f
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-29 13:37:34 +00:00
Qt Submodule Update Bot
7784f89036 Update submodules on 'dev' in qt5
Change-Id: I61e51dde3ba430920b115511cdc219bf9930927e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 13:18:51 +00:00
Heikki Halmet
4a7366f960 Provisioning: Refactor libclang installation
Libclang must use cached url (ci-files01-hki) to reduce the download time
Libclang release_60 versions were rebuild which requires sha1 changes

Task-number: QTQAINFRA-1966
Task-number: QTQAINFRA-2100
Change-Id: Iddf47a2a3a5bc38dbed684320120164bb40c028c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-06-29 05:49:22 +00:00
Liang Qi
72d711356c Update submodules on '5.11' in qt5
Change-Id: I2d450d444d40d129003461329fa5058ca1c0f140
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 05:49:17 +00:00
Qt Submodule Update Bot
26dd89e493 Update submodules on 'dev' in qt5
Change-Id: Icf069b26f93995833ef35f490f61d9d75fcaf84b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 04:46:09 +00:00
Oliver Wolff
256020fa15 Enable auto tests for winrt x64 using MSVC 2015
We are using a statically built Qt because it eases deployment of
the built tests. As static linking is broken on MSVC 2017, 2015 is
used.

Change-Id: Ie0cc0ee8229da8772ae548ca077e48086ab03adb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-28 23:54:37 +00:00
Oliver Wolff
d103986282 Revert "Enable auto tests for winrt x64 using MSVC 2015"
There are still auto test failures in qtbase for WinRT.
Revert this change to unblock CI and investigate.

This reverts commit 2fb043eace.

Change-Id: I13cc618828f773750c031daaaffce777163f8b8d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-27 14:38:02 +00:00
Oliver Wolff
2fb043eace Enable auto tests for winrt x64 using MSVC 2015
We are using a statically built Qt because it eases deployment of
the built tests. As static linking is broken on MSVC 2017, 2015 is
used.

Change-Id: Iaf665f68ab705f44e93129ff6e25384ae4b5a319
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-26 14:19:37 +00:00
Kai Koehne
92f1fe4e34 Replace commercial preview license with Qt License Agreement 4.0
Do allow people to build from git using the Qt License Agreement 4.0.
The license agreement text is the same as in the installers, except
that some Unicode characters got normalized to their ASCII variants,
and things have been properly wrapped.

This follows qtbase change 60e56f1679d6.

Task-number: QTBUG-52222
Change-Id: Id00d026e47be3bfc488419652d9f53d72d56f0d0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-06-26 08:46:25 +00:00
Maurice Kalinowski
7551b13276 Provisioning: Update MQTT test broker
Change-Id: Ie4e9ff5c13eb5f882b70e4e948836ae78496dd40
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-06-25 06:36:50 +00:00
Qt Submodule Update Bot
c145e9c217 Update submodules on 'dev' in qt5
Change-Id: I0ab9f158a0bb083d7f71da19e8583f7c5dfba536
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-24 09:10:27 +00:00
Qt Submodule Update Bot
f3d761294d Update submodules on 'dev' in qt5
Change-Id: Ib637706a9dbd933edbed0ebc44053e357806d13a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-23 20:59:07 +00:00
Liang Qi
2a58a48318 Merge remote-tracking branch 'origin/5.11.1' into 5.11
Change-Id: I48c80e0162f44a3eca1694d538971ef981d37d2e
2018-06-22 22:20:52 +02:00
Qt Submodule Update Bot
d33170e21d Update submodules on 'dev' in qt5
Change-Id: Ie1267c55571b23166d5989954a12ad07c09a26ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-22 20:18:07 +00:00
Liang Qi
33d5c271f6 Update submodules on '5.11' in qt5
Skip qtbase and qtwayland in this round.

Change-Id: Id405a21fda570ab62588f128536ba77cc01fd080
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-22 07:44:37 +00:00
Qt Submodule Update Bot
519d656f34 Update submodules on 'dev' in qt5
Change-Id: I2a83a076896b9b29103c031a204936816d3fd6f4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-20 06:10:02 +00:00
Liang Qi
ca1f50fa72 Update submodules on 'dev' in qt5
Skip qtwebengine in this round.

Change-Id: I09c52a57592d1bfa8b64a7bf5ea5beed795af02b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-18 13:57:10 +00:00
Qt Submodule Update Bot
32eee8f17a Update submodules on '5.11.1' in qt5
Change-Id: I1b1caa12ea3b4e6c36b2051d88ad8492d17d06cf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-06-17 16:49:03 +00:00
Maurice Kalinowski
bd8fe6a463 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>
2018-06-13 18:08:15 +00:00
Qt Submodule Update Bot
a25629abfb Update submodules on '5.11.1' in qt5
Change-Id: Ibc6aaaa9d4de853685695d192495e98d98d81082
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-11 10:47:06 +00:00
Liang Qi
857e3ca32a Update submodules on 'dev' in qt5
Skip qtdeclarative in this round.

Change-Id: Ia70fe1f43ce29cc321111dfc37c55f070cd806d9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-09 13:30:54 +00:00
Qt Submodule Update Bot
bfda8d1f25 Update submodules on '5.11' in qt5
Change-Id: I3b6197f122aaeca5eb1838db41d3fb864eb4043a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-09 08:41:01 +00:00
Qt Submodule Update Bot
cca980f401 Update submodules on '5.11.1' in qt5
Change-Id: I54afe311c809984962f9644830899e00d1766f96
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-08 19:06:14 +00:00
Liang Qi
7b7e0410fd Merge remote-tracking branch 'origin/5.11' into 5.11.1
Change-Id: I0bfda3a8816684275bd7f63372684cdf3e8b9ac3
2018-06-08 13:19:30 +02:00
Qt Submodule Update Bot
4ab6c1dace Update submodules on '5.11.1' in qt5
Change-Id: Ia0779127ef3859678ef194b0af2e4fdb5b25d9f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-06-08 11:02:29 +00:00
Simo Fält
eb1ca70def Provisioning: Add 64 bit Mingw to coin as packaging target
Change will provision DirectX SDK with enabler DotNetFramework also, so
that configure for MinGW will detect ANGLE correctly. The DirectX
headers and libs will be in two location, while those are installed
with MSVC also.

Task-number: QTBUG-35288
Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-06 08:37:51 +00:00
Qt Submodule Update Bot
e28ed4a3a4 Update submodules on '5.11' in qt5
Change-Id: I49fd99ca74e396010e65069e04579daa81b4fab2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-06 06:52:54 +00:00
Qt Submodule Update Bot
02127d3654 Update submodules on '5.11' in qt5
Change-Id: I01ace9bc6ad2805a7a3cdf5b464357e4bad5dc19
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-05 06:00:58 +00:00
Qt Submodule Update Bot
bdbc314b2a Update submodules on '5.11' in qt5
Change-Id: I363b007807ce65746d22ad2e2608aa17c5859deb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-02 10:41:06 +00:00
Simo Fält
6c295ac7f0 Provisioning: Install 32 bit python to 64 bit windows
In order to create 32 bit Pyside wheels we have to be able to link
Pyside against 32 bit python. While 32 Qt build is done in 64 bit
Windows Pyside must follow.

Task-number: PYSIDE-646
Change-Id: I30855d4cecd6bc6219021216e9c296d28c56b405
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-06-01 13:21:30 +00:00
Tony Sarajärvi
de191df84f Add macOS 10.13 to the CI
Includes provisioning scripts and modifications
to default.txt enabling the build. Builds are
disabled while fixing or blacklisting autotests.

Task-number: QTQAINFRA-1299
Task-number: QTQAINFRA-1300
Change-Id: I0fde33c8028c7ded9d07e8d9cb0dcfb03d5db188
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-06-01 11:45:06 +00:00
Oswald Buddenhagen
b4b1bfe1a6 Adjust submodule branches
Change-Id: I9c6e8ecf1798041b1d2524cb80be936b56216e47
2018-06-01 13:33:15 +02:00
Qt Submodule Update Bot
6b243aa278 Update submodules on '5.11' in qt5
Change-Id: Ib58c5a24c0398483da71115e049f1cbcfa8732b9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-01 06:50:50 +00:00
Qt Submodule Update Bot
4dcb07d2d4 Update submodules on 'dev' in qt5
Change-Id: Ie192c2d52f48e81160a7dd328c6a01accb8a7ebe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-31 16:48:32 +00:00
Liang Qi
154c24cc4f Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-05-31 22:07:11 +00:00
Edward Welbourne
21a37fe009 Remove LGPL_EXCEPTION.txt
It became obsolete when we switched to LGPL3, as discussed on the developer
mailing list in April 2017.

Change-Id: I67913f46c81730ffdc0f56163e854fd7043b2514
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-05-31 05:58:21 +00:00
Liang Qi
0a2465bc30 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7502e49bc75f84b7fb2d4534181a2082fc939265
2018-05-30 21:19:11 +02:00
Qt Submodule Update Bot
feb12a86f8 Update submodules on 'dev' in qt5
Change-Id: I9039e373e97899ea9ec756e07b278ea8c1f20aef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-30 16:48:29 +00:00
Qt Submodule Update Bot
e09cd7630f Update submodules on '5.11' in qt5
Change-Id: I695ecee66a9a0c256e6df2c68790cf3f9d58ac9a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-30 05:56:51 +00:00
Qt Submodule Update Bot
ff8efac616 Update submodules on 'dev' in qt5
Change-Id: Ib89eaa00e83cf0d124980660397a54aafc506196
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-29 07:48:01 +00:00
Qt Submodule Update Bot
7c3689778e Update submodules on '5.11' in qt5
Change-Id: Ib8dd64712bea33b7dffc46ea13bdd7c5239121cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-29 06:51:23 +00:00
Joni Jantti
e9faaf8239 Provisioning: Remove broken proxy setup from RTA 32-bit Windows 10
Currently the proxy disabling script on 32-bit Windows breaks the
internet settings, preventing browser usage for example.

Change-Id: I77282f0d929a6223ceafd3b648d2e2a7b16186c9
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-29 06:47:16 +00:00
Oliver Wolff
e57ef7c949 Update winrtrunner
A newer build of winrtrunner is needed. It is built from dev and
contains fixes related to handling of test output (most
importantly 044e9ad878ed1cf0ace0a9260b55cc94c71a294d).

To make the script more stable, the newer version of winrtrunner
was also copied to ci-files01, so that an alternative download
location can be offered.

Change-Id: I6a429aa3292266067756ce7ba3553088dc168197
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2018-05-28 11:38:29 +00:00
Qt Submodule Update Bot
f11b58d500 Update submodules on 'dev' in qt5
Change-Id: I5b5825abf17a302fde54efb7fb24684f3461b6dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-28 06:56:21 +00:00
Qt Submodule Update Bot
9ca1d1bf8f Update submodules on 'dev' in qt5
Change-Id: Ib7cdc0ff958af88d011c1db1a49e11f7378582d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-27 17:40:32 +00:00
Qt Submodule Update Bot
15ae235e51 Update submodules on '5.11' in qt5
Change-Id: Ic5b0846668d59b88e47e432dd692b569079e09a3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-27 17:06:00 +00:00
Qt Submodule Update Bot
6f6efe15fd Update submodules on '5.11' in qt5
Change-Id: I09f4b1a1c4d50f935f5d7c83fcab232d05630b68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-26 00:02:24 +00:00
Maurice Kalinowski
b317ad8096 Remove hardcoded download path
Previously all files got downloaded to a hardcoded path, including the
username for the CI machines. Usually, it does not fit the username of a
local development machine, complicating to reproduce bugs.

Introduce Get-(Default)DownloadLocation functions in helpers to
specify the default download location. This helps to run the
provisioning scripts on a local machine.

Change-Id: I761a92bf5e3e774358756a95dddb9a5d6ee54db9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-05-25 10:25:55 +00:00
Maurice Kalinowski
45709cec07 Provisioning: Update Open62541
Change-Id: I04d8dfed982c68efb83f28a2f34f8632e3a66312
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-05-25 07:32:00 +00:00
Maurice Kalinowski
d9fcbde41d Provisioning: Install Open62541 on Windows
Open62541 is one of the supported OPC UA backends in the Qt OpcUa
module.

Change-Id: I9baaffbae058d0590819e248694ee41887558708
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-05-25 06:45:00 +00:00
Qt Submodule Update Bot
7670e95e52 Update submodules on 'dev' in qt5
Change-Id: I4f192d544796443b3986393d386323791563918c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-25 06:44:56 +00:00
Qt Submodule Update Bot
275f53c681 Update submodules on '5.11' in qt5
Change-Id: Ide77625c853aa01db8e4d6e51bc7d693788884c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-25 06:43:46 +00:00
Qt Submodule Update Bot
32c5bc52ce Update submodules on '5.11' in qt5
Change-Id: I167745a5280f35ab02e81e4a55c87f779d3f1a1a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-24 16:04:51 +00:00
Qt Submodule Update Bot
8aa0d92d3d Update submodules on 'dev' in qt5
Change-Id: I2b45743807a8b4456e58756ecf7e4a8afa476b8f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-22 06:29:55 +00:00
Qt Submodule Update Bot
0cd3312bd4 Update submodules on '5.11' in qt5
Change-Id: I75e33acd5abd94893ba89acc249ef3808b04b06f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-22 00:01:29 +00:00
Simo Fält
2a27a539e7 Restore clang version 4.0 to RHEL 6.6
Libclang is required for Pyside to compile, so dropping it totally would
block Pyside development.

Change-Id: I9c0deb3f0457f97bc4c36179971d49d58ca244a6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-05-21 11:51:19 +00:00
Qt Submodule Update Bot
407d64d584 Update submodules on '5.11' in qt5
Change-Id: I1b7a7a9970f15669e9957a99b1f932e0ad22a209
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-21 08:25:13 +00:00
Qt Submodule Update Bot
9dbddbcc8e Update submodules on 'dev' in qt5
Change-Id: I3401f64d62d459c640c2e3239b09861a17f8a2f0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-21 08:25:01 +00:00
Qt Submodule Update Bot
3c3f50c015 Update submodules on 'dev' in qt5
Change-Id: I2e63b1e58332e29a6f229069756e1da6e5373709
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-20 09:16:33 +00:00
Qt Submodule Update Bot
b496b5f4d2 Update submodules on '5.11' in qt5
Change-Id: I3883afd4c1f626825e7c5741364f255862a2e512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-20 00:00:55 +00:00
Qt Submodule Update Bot
9dbf3d46ba Update submodules on '5.11' in qt5
Change-Id: I24c92fc659cbf40271b171ecf8179ffed14e5454
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-19 11:49:55 +00:00
Qt Submodule Update Bot
5b5f008526 Update submodules on 'dev' in qt5
Change-Id: I1de969915ada8d1915da4107ff7e4620340fb269
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-19 08:34:26 +00:00
Liang Qi
b6c915e4c5 Update submodules on '5.11' in qt5
Change-Id: I9398f42e940a4249e1fece564e51aa028e7f7464
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-18 21:30:50 +00:00
Liang Qi
a2b5c37d7a Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ifa6c63ef62e339b90e571b13c73addaa17d7af4e
2018-05-18 11:55:23 +02:00
Qt Submodule Update Bot
ea52430c66 Update submodules on '5.11' in qt5
Change-Id: I888cec01eaeab2b2029b172061d2ce07170faa97
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-18 07:17:37 +00:00
Qt Submodule Update Bot
03138c3980 Update submodules on 'dev' in qt5
Change-Id: I4478023c65825d45085b3fe3bf77fda0a3bfe827
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-17 09:20:53 +00:00
Qt Submodule Update Bot
3a0c2b894c Update submodules on '5.11' in qt5
Change-Id: I9d3f11e5fa9df3a4596474312a2ffc0426e495c5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-17 07:20:03 +00:00
Liang Qi
9cc1220a43 Update submodules on '5.11' in qt5
Change-Id: Ib08b9121da4235621876f41686f2715f01db0b30
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-16 21:04:33 +00:00
Qt Submodule Update Bot
081601ba0e Update submodules on '5.11.0' in qt5
Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-16 14:32:45 +00:00
Qt Submodule Update Bot
f6f9bd6d93 Update submodules on 'dev' in qt5
Change-Id: Ia4432c50cba26e11284b74d5ea87d9a77b8da950
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-16 10:43:52 +00:00
Jędrzej Nowacki
54261be7c3 Remove RHEL 6 from the CI
RHEL7 was introduced to replace RHEL6, we do build packages on RHEL7
already. The only coverage that it adds is an old gcc, but in the same
time it is quite expensive to maintain because of generally old
software stack.

Change-Id: I9955747efecefc3354aa9e1f1c45f7d1bc48dfc6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-05-16 10:43:45 +00:00
Qt Submodule Update Bot
e7a999ce4d Update submodules on '5.11.0' in qt5
Change-Id: I4de0d56b6bd15782984f67e4107b7ec9a90731e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-16 09:14:15 +00:00
Qt Submodule Update Bot
426708026e Update submodules on '5.11' in qt5
Change-Id: Ia95638ce97e677ceeb0bfd85b287735b6027eeb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-15 12:50:30 +00:00
Qt Submodule Update Bot
defbea3929 Update submodules on 'dev' in qt5
Change-Id: I05469b85b7cf92b21ed9c3e82a89c116ff66abe0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-15 12:27:13 +00:00
Qt Submodule Update Bot
d7b03bf0bc Update submodules on '5.11.0' in qt5
Change-Id: I13dae70cd516b623c9e9039a6c8b71de84e88459
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-15 11:00:36 +00:00
Samuli Piippo
1c8ff381be Change QNX7 x86 release builds to x86_64
Task-number: QTBUG-67746
Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-15 06:13:26 +00:00
Simon Hausmann
d75411d6e5 Fix linking of qdoc against an external libclang (part 1)
This is the qt5 part of the fix for the task. For the special version of
libclang we hacked together that allows static linkage, set an
environment variable that the mighty qdoc build system can utilize to
activate the release packaging specific linkage.

Change-Id: Ie340955214585329fe8fd3bc790e3cd6c6be42f9
Task-number: QTBUG-68178
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-05-14 12:30:59 +00:00
Qt Submodule Update Bot
e18e2b1a49 Update submodules on 'dev' in qt5
Change-Id: I046ebf51bbccb3e75275ba57fdf1c555d41ae6df
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-14 09:32:33 +00:00
Qt Submodule Update Bot
36e5f25e56 Update submodules on '5.11' in qt5
Change-Id: Ia5f7391624235fe85ba4ee591ff7a9dacc380a61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-14 08:53:54 +00:00
Qt Submodule Update Bot
a32c6e3d8d Update submodules on 'dev' in qt5
Change-Id: I666fee90000d4a36d5f2acd47e43fd0d95d954b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-11 08:17:56 +00:00
Qt Submodule Update Bot
1f510d9514 Update submodules on '5.11' in qt5
Change-Id: I0bbfab039743e644b1acf3321bb900c4ad8a43f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-11 00:01:14 +00:00
Qt Submodule Update Bot
e77da9ecb3 Update submodules on 'dev' in qt5
Change-Id: Ie4e6177e118c2783723ca8c12fbab50be6044912
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-10 17:06:55 +00:00
Liang Qi
1e5cf1852a Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia167d4f873ed500e3bae798eade6720db6b21750
2018-05-10 12:38:49 +02:00
Qt Submodule Update Bot
f5ef436426 Update submodules on '5.11' in qt5
Change-Id: I7020e4048d61eec71f931da3fc12da2613d3dab8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-10 08:33:12 +00:00
Liang Qi
b1f1bf5560 Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ia252225aa1339ac448dd726b149e08739c02dfc5
2018-05-09 22:12:22 +02:00
Qt Submodule Update Bot
b1b04fcb1a Update submodules on '5.11.0' in qt5
Change-Id: Ia6d3ee44db368765612cea543952878499889d6b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-09 12:05:12 +00:00
Qt Submodule Update Bot
af8eab0993 Update submodules on 'dev' in qt5
Change-Id: I6cedb5c221711ed38323d4ba5a4b6cbd693f6c6c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-09 10:34:54 +00:00
Qt Submodule Update Bot
1989bc105d Update submodules on '5.11' in qt5
Change-Id: I0922b0b730ec0abd02d5940fdf6b3e7b1162baba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-09 07:43:10 +00:00
Qt Submodule Update Bot
f0dfbba994 Update submodules on 'dev' in qt5
Change-Id: I26fdc25d6a542dc6f0f4faeca0af84d171c491f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-08 17:52:30 +00:00
Rainer Keller
24eaf68a10 Provisioning: Remove freeopcua
Support for it is dropped

Change-Id: I574a50f279df9e390954e6dece4b947c8860038b
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-05-08 10:17:50 +00:00
Qt Submodule Update Bot
39a109c884 Update submodules on '5.11' in qt5
Change-Id: Ibfe4750bb82679e1a0366c77d74ef9491b642212
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-08 00:01:20 +00:00
Qt Submodule Update Bot
4d9ab7c72c Update submodules on '5.11' in qt5
Change-Id: I29efdec1b59ea7703481840aaaf4220778eace13
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-05 07:14:29 +00:00
Qt Submodule Update Bot
9819faba63 Update submodules on 'dev' in qt5
Change-Id: Ibcea46a3aafdbb3fc999be6c61b7c469b4a5ae68
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-05-04 18:26:17 +00:00
Qt Submodule Update Bot
8cd324b216 Update submodules on '5.11.0' in qt5
Change-Id: I73fe6947d8ffdf56ea77e9aab5eb89955a0eed2f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-04 18:21:18 +00:00
Qt Submodule Update Bot
ab7772a73d Update submodules on '5.11.0' in qt5
Change-Id: I37be73eba9442b56b5f7147e7d69b98ce464b44d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-03 15:42:55 +00:00
Qt Submodule Update Bot
c740458cd8 Update submodules on '5.11' in qt5
Change-Id: I3d5244647a09a02ed54879e3a79dbce7daa65460
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-03 05:47:55 +00:00
Tony Sarajärvi
80b8954591 Update openssl packages to 1.0.2o
Change-Id: Iab7043212cc3b66c26100519d95ac18fc69fa26a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:49 +00:00
Tony Sarajärvi
b1c3eeb213 Fix styles in setting proxy
Change-Id: Iac4243e767a7cfb29b9bb0b4603ca6509356ce8c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:44 +00:00
Tony Sarajärvi
c7562fa8ef Take proxy into use in python provisioning in windows
Task-number: QTQAINFRA-1669
Change-Id: I2030f244da65e4fd0c3b0be54d941b065f9a180e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:40 +00:00
Qt Submodule Update Bot
f5af9f119b Update submodules on '5.11' in qt5
Change-Id: I9e2f1fdb7f746a96d5e78889c1a77741ed9f116c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-02 11:37:57 +00:00
Liang Qi
b49034df17 Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: I59d364b4165766e33d6344f7b3e10f0bc79c7442
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-02 07:14:39 +00:00
Simon Hausmann
41369b6282 Install the MinGW build of libclang
This restores the MinGW installation of libclang on Windows 7 and
installs the MSVC and MinGW builds in parallel on Windows 10. For
compatibility reasons the MSVC installation is done last, to ensure that
the older LLVM_INSTALL_DIR variable points to the MSVC installation. In
addition though we now get LLVM_INSTALL_DIR_MINGW and
LLVM_INSTALL_DIR_MSVC, which qt_find_clang.prf in qttools can use in the
future.

Task-number: QTBUG-66015
Change-Id: I8b53b85d0cde597c88a089f2a05f03947828d9bd
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-05-01 06:34:05 +00:00
Liang Qi
6840a639ec Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I02bb2ecd3b1121255d885082023f24412284b445
2018-04-29 20:25:03 +02:00
Tony Sarajärvi
889cdbf4a8 Fix shellcheck complaints for RHEL 7.x in provisioning scripts
Change-Id: I489f4f25d603457c8f0444ed277a162a7fd4128f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 16:12:00 +00:00
Joni Jantti
7a018aeb8b Provisioning: Add a clean Ubuntu 16.04 x86
A clean ubuntu 16.04 provisioning is required by RTA.

Task-number: QTQAINFRA-1640
Change-Id: I83f53c7b677da6d1aa0e89cc6bde0b2363a7ae1e
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:21:10 +00:00
Oliver Wolff
8d04f876e7 windows provisioning: Do not use Windows builtin way of extracting zips
The builtin way of Windows for handling zip files is much slower than
using 7zip. A small benchmark (not representative, just extracting the
android ndk) showed 11 minutes using Extract-Zip vs 2,5 minutes using
Extract-7Zip on my machine.

Change-Id: I5198aabb5b75860ead687581fc5e368eb75e48ae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-04-29 13:21:05 +00:00
Heikki Halmet
e3699c5a6f Add missing sw versions to versions.txt
Change-Id: Ifa12b6c6308e4ad73989e7e935061f77ae1823e2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-29 13:21:01 +00:00
Joni Jantti
93e31c1281 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>
2018-04-29 13:20:55 +00:00
Tony Sarajärvi
ce1479c1d3 Provisioning: list installed packages in distro
Change-Id: I71bbfbfba034066cffd4cb1a9d781d386b1b6b9a
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:51 +00:00
Tony Sarajärvi
d93baa38d0 Fix powershell stylings in provisioning scripts
Change-Id: I946027047b9810ec1197b50394f157eb406434c2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-04-29 13:20:48 +00:00
Tony Sarajärvi
cd87f148dd Fix Squish Provisioning coding style
Change-Id: I663ce38fffa3a9446972d1790d80f76b7155c029
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:44 +00:00
Tony Sarajärvi
b8c0fb552f Fix and-or in NTP disabling
Change-Id: Ib4b6ffa65ba600919ad71b2748da5055449f3164
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-29 13:20:40 +00:00
Tony Sarajärvi
5586a17eff Fix shellcheck complaints for openSUSE provisioning scripts
Change-Id: I5360a1b7b4c405d7ca9fedee8e100d933ec6e7b7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:36 +00:00
Tony Sarajärvi
eccb53c607 Fix shellcheck complaints in common macos provisioning scripts
Change-Id: I9d6891a2956f66ebf2ca759c4085acad30a84618
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:32 +00:00
Tony Sarajärvi
9bf79e6bab Fix shellcheck complaints in provisioning scripts
Change-Id: I38306c6d2ff360dc12f8c33b289bbc4ae4935aca
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:29 +00:00
Liang Qi
cddb2254c3 Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: I26bdf0fefb782f3f93c6674ebf183ce1dd6e13e6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 09:38:15 +00:00
Liang Qi
c17c6f224c Update submodules on 'dev' in qt5
qtdeclarative was switched back to 913dc3f4f2be7c2c23237bcb9bffb3192cb10d60
due to sick coin integration.

Change-Id: I3defce1fb1f2ca86c85ada2605b351bf48668082
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 06:32:52 +00:00
Qt Submodule Update Bot
1125bbae42 Update submodules on '5.11' in qt5
Change-Id: I342c23fe566e1f2d8bf1aab24a7b9c6c47ea82fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-28 20:10:13 +00:00
Qt Submodule Update Bot
d14d8f0cac Update submodules on '5.11.0' in qt5
Change-Id: If2f1f76270195f337803ba302e46049acb015e3c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-28 16:22:40 +00:00
Qt Submodule Update Bot
5cc5f606a9 Update submodules on '5.11.0' in qt5
Change-Id: Ica9fca497f78dd4660118814acce3a4c2c0e68b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-28 11:59:13 +00:00
Jędrzej Nowacki
c5ddbdb86b Update clang version to 6.0
The version also contains statically compiled libraries so we can
ship qdoc without shipping libclang.

The change temporarly removes CI qdoc builds from RHEL6 and MinGW,
these two configurations are not used for packaging, just for CI
testing. We should restore MinGW later.

Task-number: QTBUG-66015
Task-number: QTBUG-67764
Change-Id: Ie37b4be6a639e81d9ef0815682c6d60981cbeaae
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Fredrik de Vibe <fredrik.devibe@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-04-28 11:59:06 +00:00
Qt Submodule Update Bot
e48317193f Update submodules on '5.11' in qt5
Change-Id: I33004fcf26af40c9f17315a8aa5e66b22cc5f6ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-27 07:31:55 +00:00
Qt Submodule Update Bot
a809b77965 Update submodules on 'dev' in qt5
Change-Id: I17e0dbd8ba367b310f391daacc427a66051fb75a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-26 04:55:13 +00:00
Liang Qi
c4d98c8dd1 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie540fd9391b53aa249c1c46bf1089575572612de
2018-04-25 20:14:43 +02:00
Gatis Paeglis
8115be2811 Provisioning: Ubuntu - remove Unity window decorations
Unity does not respect setGeometry() call, which is
violation of WM spec. During the years we have tried
various workarounds, but it has proved to be counterproductive.

This patch adjusts Unity theme to not draw window decorations,
ensuring that Unity treats the setGeometry() call the same way
all the other WMs and platforms we are testing on.

For more detailed explanation see QTBUG-67757.

Task-number: QTBUG-67757
Change-Id: I8d2bb9f2af14d3c184fc218ed08a1febd70f4026
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2018-04-25 05:48:35 +00:00
Liang Qi
13051ee1d2 Update submodules on '5.11' in qt5
Change-Id: Ifc4c66653fe08abaee02e743ba947170b20f5acc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-25 05:48:31 +00:00
Liang Qi
4442b551be Update submodules on 'dev' in qt5
Change-Id: If80bed6e4c0a484f2366deeb59d3b133f0850db6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-25 05:42:52 +00:00
Qt Submodule Update Bot
0e870f5594 Update submodules on '5.11.0' in qt5
Change-Id: I16b8e45bd4dff9470299aced9fdf5302878f61f8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-24 19:43:11 +00:00
Liang Qi
38e6ddc9ee Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Ida278c6731466e7de8c9dc9115a948488869a746
2018-04-20 15:29:36 +02:00
Qt Submodule Update Bot
60dd5ad451 Update submodules on 'dev' in qt5
Change-Id: I462316f021624950e61ae38aceee90b49600816f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-20 10:33:52 +00:00
Qt Submodule Update Bot
2671e05023 Update submodules on '5.11.0' in qt5
Change-Id: Ie95476e1e3f240b8a55da79b09c65736f240272e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-18 17:16:53 +00:00
Qt Submodule Update Bot
5aca8f9e5e Update submodules on 'dev' in qt5
Change-Id: Ic476ef7434eb7911177d95618094d7972d0f6203
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-17 21:49:19 +00:00
Topi Reinio
795981e720 Provisioning: openSUSE-42.3: Install libpulse-devel
Required by Qt Multimedia.

Task-number: QTBUG-64538
Change-Id: I12e5a1b1a6390f553d883ce12647475eb9dd2992
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-17 16:43:53 +00:00
Liang Qi
4d4159f7b7 Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Id0540cee408413b7f5ab7410f3d1db3f38fd46af
2018-04-17 14:15:23 +02:00
Liang Qi
9a8c6faf26 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8bb29f5e2edfbee3df2388712137cfd7f31aa3aa
2018-04-16 10:40:51 +02:00
Qt Submodule Update Bot
7f937b6d94 Update submodules on 'dev' in qt5
Change-Id: I54baff3ba462cfcab812bf3a97378a1f2b169a49
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-16 03:59:53 +00:00
Simo Fält
6a06c4b4fe Revert "Install Python 2.7.13 to RHEL with pip"
This reverts commit 794913dde7,
which seems to break pyside builds. Instead we install python-pip
package from the EPEL repository.

Change-Id: Ic84680b0b0d6950d389bb42a6add18c83256f00f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-16 03:32:20 +00:00
Liang Qi
1567d66269 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I299251ffa3bf10346d0d99abe02b14d7af5b5860
2018-04-15 19:13:55 +02:00
Qt Submodule Update Bot
6c8307abf6 Update submodules on '5.11' in qt5
Change-Id: I18750ffb5810a3f60a2b615ca487ce42459d560d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-15 16:41:22 +00:00
Heikki Halmet
83f2a25f17 Provisioning: Add test for squish installation
Squish is needed by RTA which is not run during normal qt5 build. Other
words squish installation is not tested during integration. That's why
we need separate test for it.
This change will fetch test and run test suite which is made to check
that squish installation works

Task-number: QTQAINFRA-1733
Change-Id: I9284fd52d87767ae04022c3a6996e0bb972315dd
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-15 16:41:18 +00:00
Joni Jantti
e8a60ed41b Provisioning: Ubuntu - Add QNX 6.6.0
QNX 6.6.0 is required by RTA.

Task-number: QTQAINFRA-1914
Change-Id: Id0578050d24fb13f3e10a10e972be790d39f9bc0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:13 +00:00
Joni Jantti
c404097600 Provisioning: Win10_x86 - mysql
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: I13d78da0bd3ea2fa8a75734fb5f88a472cbd79de
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:08 +00:00
Joni Jantti
3d6736a7f1 Provisioning: Win10_x86 - openssl
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: I4937980a1f23d56e509b71541605c80cb6423402
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:04 +00:00
Joni Jantti
c1e2307d02 Provisioning: Win10_x86 - psql
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: Ia13d9586d1c1934c8c4e51fcbe9ce826bba68524
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:00 +00:00
Joni Jantti
081861de18 Provisioning: Win10_x86 - Windows 10 SDK with debugging tools
RTA needs debugging tools for Windows 10 x86 testing.

Change-Id: I69cae92a2529a933a018f22c1b200bdc4d2c0aa0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:40:57 +00:00
Tony Sarajärvi
8375a33d4a Fix squish provisioning script typo
Change-Id: If33847a552fe40128cef577b99adf3152de3a9e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-15 16:40:53 +00:00
Tony Sarajärvi
cd347c86af Fix shellcheck complaints in RHEL 6.6 provisioning scripts
Change-Id: Idb4240b4cfd309b2c6c418e8c18b175a491f8eea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-15 16:40:49 +00:00
Liang Qi
6df84f8984 Update submodules on '5.11' in qt5
Change-Id: I5b4c4043f2bfb2bf3e62bc06e244a4fec3e5bbd6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-15 05:55:49 +00:00
Heikki Halmet
cfc44559ef Provisioning: Install Git Large File Storage
This tool is needed to clone some repositories correctly

Task-number: QTQAINFRA-1921
Change-Id: If4744304490649aeecf9daa0c1f840ded9b7beed
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-04-15 05:55:45 +00:00
Heikki Halmet
f9e9dd1393 Provisioning: Use wayland libs provided by distro
Redhat repositories includes needed wayland
libraries. Let's use those instead providing
those through provisioning.


Task-number: QTQAINFRA-1925
Change-Id: I543a6b9fb8876f64d4b9c17ef909b9c61129e62e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:42 +00:00
Heikki Halmet
ba30e967d0 Provisioning: Set ssh key and configurations for Yocto build
Task-number: QTQAINFRA-1888
Change-Id: I2dd01080998866ce2affd6a5aea797540f28db19
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:39 +00:00
Heikki Halmet
2e6af2bba7 Provisioning: Upgrade pip to latest version
Latest pip version is not installed during python
installation. Pip need to be reinstalled after python
installation because older version of pip seems to cause
installation problems randomly at least with python 2.7

Task-number: QTQAINFRA-1902
Change-Id: If3d74130ecee6e410c64cad309feff9edc0e5db0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:35 +00:00
Heikki Halmet
c79d285ffa Provisioning: Remove sha1 file after shasum check
Change-Id: Iee8e66d98e5ebd2dee18baf8e1752a86065417d1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:32 +00:00
Qt Submodule Update Bot
f728979975 Update submodules on 'dev' in qt5
Change-Id: I963065f0eca222056e025ec9fd86f4929b43e662
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-15 05:50:05 +00:00
Simon Hausmann
847cbbd869 Remove qtenginio
The module has been dead for a while as well as the corresponding
service.

Change-Id: I40ce39f18d32be7ae22e944dcd181a7d7c0cfce5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-13 10:45:53 +00:00
Oswald Buddenhagen
24e1a15d40 Adjust submodule branches
Change-Id: Ic069e5dedce639cb1c17df06ee43e87eacc139d8
2018-04-12 14:07:13 +02:00
Qt Submodule Update Bot
73be04a169 Update submodules on 'dev' in qt5
Change-Id: Ifec2d71b764805946eff7ddfefb8cf439c07e9bc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-12 05:12:14 +00:00
Qt Submodule Update Bot
2074cadecd Update submodules on '5.11' in qt5
Change-Id: Ibfd10c0da7c86f52a860cd39776519c9d4ab4b61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-11 05:44:38 +00:00
Qt Submodule Update Bot
7ae52b78e4 Update submodules on 'dev' in qt5
Change-Id: I8f4b1e5069782dc9269d1510f08a0e252cc5f9b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-10 20:35:16 +00:00
Liang Qi
9b584a8117 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I63778fc883354b724fcf91d92ee6d80b7cb481aa
2018-04-10 15:04:06 +02:00
Liang Qi
5abe434755 Update submodules on 'dev' in qt5
Change-Id: Ia35c5a575635a4c02f209822501bf7dd71351f87
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-10 10:46:52 +00:00
Qt Submodule Update Bot
1616d89eea Update submodules on '5.11' in qt5
Change-Id: I71ed7dbae2d7071e9c16a6e24979174b1b75d640
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-10 08:31:14 +00:00
Qt Submodule Update Bot
69841b3e9a Update submodules on 'dev' in qt5
Change-Id: Ie17a34259d7a1ba39f341a915d95901a1a9e7499
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-07 12:50:36 +00:00
Qt Submodule Update Bot
7f6fd7621b Update submodules on '5.11' in qt5
Change-Id: Ie59c702af192cf03bb5c865345625f61feb83887
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-07 08:26:59 +00:00
Oliver Wolff
0029642f18 Fix msvc_2015_update3_patch
Change-Id: Ie008b274c2f27d9792340dd4f6c2d3215bd376ca
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2018-04-06 19:41:22 +00:00
Tony Sarajärvi
daeaec9b3c Remove updating of RHEL 7.4 system during each provisioning
Yum update doesn't only fetch the repository data. It also runs
a distro upgrade. So if something gets updated that isn't
compatible with us, it breaks. It also slows down the provisioning
a lot.

Change-Id: I27136bc572fbce5410b82ff9574cf85bf89e3100
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-06 19:41:19 +00:00
Qt Submodule Update Bot
9fdc8fe5e9 Update submodules on '5.11' in qt5
Change-Id: Ic767892fd0ed815d1cec35eced62e83b1ac4e029
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-06 19:41:16 +00:00
Joni Jantti
9af755a79e Add VC build tools to Windows 10 x86 template
These tools were missing from the installation.

Change-Id: I627b28a6f9373df708952e22a7f404b8dbce6239
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-06 11:02:51 +00:00
Qt Submodule Update Bot
2171fc5840 Update submodules on 'dev' in qt5
Change-Id: Idbf93b4fc080fc6921a6e91822650c9d7520d6c8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-05 21:21:15 +00:00
Liang Qi
d4edeff8aa Update submodules on '5.11' in qt5
Change-Id: Ic5b5615653f2fed507c75ca96a05de0affb65863
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-05 18:42:39 +00:00
Eskil Abrahamsen Blomfeldt
3c23dc4846 Don't require Qt Android Extras for Qt Purchasing
Qt Purchasing is supported on other platforms than Android, so
move qtandroidextras from depends to recommends instead.

Task-number: QTBUG-67318
Change-Id: I9c70574dd9b45579485b2640f7daeebdc6c2bc63
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-05 14:44:48 +00:00
Joni Jantti
9e74a1e5b7 Add a clean installed Win10_x86 for RTA
Task-number: QTQAINFRA-1842
Change-Id: I0334d74055690c7f850fd105fe008d11a8e57b8c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-05 13:10:26 +00:00
Qt Submodule Update Bot
bb9547048b Update submodules on '5.11' in qt5
Change-Id: I2c8dfa7b7b27e6aa80381761d8b7883690133496
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-04 07:22:50 +00:00
Liang Qi
98daaeac6c Update submodules on 'dev' in qt5
Skip qtbase in this round for QTBUG-67371.

Change-Id: I95034ff9451b4c1fbfc8d820d0af365dddb63cdf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-03 06:41:52 +00:00
Qt Submodule Update Bot
7c19a3f83b Update submodules on '5.11' in qt5
Change-Id: I7e60d0eae7d23fbc2eebf1734c3fd9a713b6b732
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-02 00:00:58 +00:00
Qt Submodule Update Bot
9f50ae280f Update submodules on '5.11' in qt5
Change-Id: I7f31b0b19c8380a7f5420917ad7dc423e3ca3658
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-01 10:23:51 +00:00
Qt Submodule Update Bot
fe06923553 Update submodules on '5.11' in qt5
Change-Id: I89c95acfd2ee14574c0ca524d80837023dbc112f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-31 10:49:31 +00:00
Joni Jantti
dbe27bc9cc Provisioning: Win8.1 - Add jom for RTA
Jom is required by RTA.

Task-number: QTQAINFRA-1895
Change-Id: Iec99a91d2a48c4c6ef49829e4f05baa90d1a96e0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-30 17:57:20 +00:00
Qt Submodule Update Bot
c8b3ed182d Update submodules on '5.11' in qt5
Change-Id: I2f7afb1e261e59e527a482983f699402f0d29d85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-30 11:11:25 +00:00
Liang Qi
e27f168cd9 Update submodules on 'dev' in qt5
Skip qtbase in this round for QTBUG-67371.

Change-Id: I1d3fe67288fb4ed3a02233cab9502be8ba543129
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-29 07:28:37 +00:00
Qt Submodule Update Bot
8f73d37425 Update submodules on '5.11' in qt5
Change-Id: I77701db7d1955d7309d464ca1597888d98883a30
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-28 17:28:28 +00:00
Miikka Heikkinen
9dd5f6d861 Add SeparateDebugInfo for linux release
Task-number: QTQAINFRA-1688
Change-Id: I3557ac1e2bb6964278f381736f87e6fd3304744b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-28 14:24:53 +00:00
Frederik Gladhorn
a01e7f3d40 Install an android virtual device for testing
The goal is to run tests on the AVD eventually.

Change-Id: I7ac887661497b5169c154ef8b0264ef07749a36a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-03-26 09:18:48 +00:00
Frederik Gladhorn
8552003532 Reduce wget verbosity when downloading qnx
The default style gives 1 KiB dots, 50 KiB per line, and the file is
567 MiB (~11600 lines). Reduce it to 1 MiB per dot and 32 MiB per line
(~18 lines).

Change-Id: Id181eee63313a4ad486af6c4752de0ed9ed5f7b6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-03-26 09:18:45 +00:00
Qt Submodule Update Bot
787af82934 Update submodules on 'dev' in qt5
Change-Id: I9bbfda518eb65d33c6b70bebc8e57f6e24ab79ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-26 08:27:48 +00:00
Qt Submodule Update Bot
c04f645472 Update submodules on 'dev' in qt5
Change-Id: I704b7ec298f4669b21bc2678c34f15b69d143c24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-25 05:51:29 +00:00
Jani Heikkinen
4eeb6ba0bb Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-23 05:14:26 +00:00
Qt Submodule Update Bot
63787a03e4 Update submodules on 'dev' in qt5
Change-Id: I3926d3b14d2e258e5418c2fb65db89932a62795b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-23 05:14:20 +00:00
Liang Qi
81835942b5 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If72681a7d994b784c8b17fa0f9bafaef722f27d3
2018-03-22 10:06:22 +01:00
Heikki Halmet
8197e80155 Provisioning: Remove Java update from windows startup items
Change-Id: Iec709c9c42840910ab0dd98634c200d2aba8f7bf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:45 +00:00
Tony Sarajärvi
794913dde7 Install Python 2.7.13 to RHEL with pip
System's default Python is 2.7.5 and doesn't come
with pip at all. To install its pip, it would require us to
enable the EPEL repository and install it from there.

The repos we use already include Python 2.7.13. If we install that
we get pip as well.

Change-Id: I083a970697a962ddb301616695c2cf419f1229f8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:42 +00:00
Joni Jantti
5085220907 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>
2018-03-22 06:05:39 +00:00
Tony Sarajärvi
de4e9c2169 Provisioning: refactor squish install
Change-Id: I18e5f8f5d92cff5af2335cc5ac4cf571d27224ac
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-22 06:05:36 +00:00
Tony Sarajärvi
f1eca9bbff Remove duplicate python-devel provisioning from RHEL 7.x
Change-Id: I445135d675fa6b5cb305f6aadf5b754ab248a1ff
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:33 +00:00
Tony Sarajärvi
ab021d4bb4 Make unzip less verbose in macOS
Change-Id: I83249f724ecbfeeb4fd5c1cd33a9c6195c590c4b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-22 06:05:30 +00:00
Frederik Gladhorn
9ae91ae3f8 Update Python 3.4 to 3.6 in RHEL 7.x
Also install Python 3 through system packages instead
of some weird scripts.

Change-Id: Ie22e126a422bd6efe9b3030d5044f4c196894ca8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:26 +00:00
Joni Jantti
418cb4c4f5 Provisioning: Win8.1_x64 - Add Python2 and Python3 for RTA
Python is required by RTA.

Task-number: QTQAINFRA-1870
Change-Id: If63218da138995580a3bed5ede8996d722fff48d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:23 +00:00
Matti Paaso
b59f4207a3 Add Windows 8.1 target for RTA
Change-Id: Ifd055590bada66f7437af0b4de4a8549440952ae
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:20 +00:00
Jani Heikkinen
46dcec5ecc Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-21 05:08:32 +00:00
Qt Submodule Update Bot
3bd7671a97 Update submodules on 'dev' in qt5
Change-Id: If894a58424fae08b0648cd54d38adf6faf847e26
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-21 05:08:28 +00:00
Qt Submodule Update Bot
488dc5c36e Update submodules on '5.11' in qt5
Change-Id: Id1050cad70aad6d24368220769709b817dc70f8b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-21 05:07:39 +00:00
Qt Submodule Update Bot
3cb40d34d3 Update submodules on '5.11' in qt5
Change-Id: I12849c9612793703b598411c6a6b3c433f27b4fc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-20 12:38:16 +00:00
Tony Sarajärvi
f6d18ec9b3 Disable background update checks in RHEL 7.x
Change-Id: If17fd47850be8b3a59ded7e0a543c9160f92b84c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-20 12:38:13 +00:00
Liang Qi
4b18389605 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iecb1db823736ed8eba450cbe1df1e5d0f46bbc7a
2018-03-20 11:32:45 +01:00
Qt Submodule Update Bot
9d4fdf373f Update submodules on 'dev' in qt5
Change-Id: If5f921f7296d09f855eccec24ceed0ba880c5cda
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-20 10:05:20 +00:00
Heikki Halmet
a6feaec287 Provisioning: Fix java installation for mac
Change-Id: I3b6672e671720416af71631c2f9ce814f07e596a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-19 11:57:09 +00:00
Tony Sarajärvi
1b5f8cec03 Remove try_catch.sh helper script
Change-Id: I3981920bb8085ffbad89c31e0fd628a6e11146b6
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:57:06 +00:00
Tony Sarajärvi
2f9a2f65e5 Remove try_catch codes from macOS 10.12 provisioning
Change-Id: I57fbfdef3e8105e9e66c576ef545fc6c22400ac7
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:57:03 +00:00
Tony Sarajärvi
a98b0f3d79 Remove try_catch codes from common macOS scripts
Change-Id: I66291e2da5514499387b61e01ad85a652cd24d7b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-19 11:57:00 +00:00
Tony Sarajärvi
90261c1df5 Remove try_catch codes from unix scripts
Change-Id: Iabadbf28c65132ae614048cb98e92f57e3786056
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:58 +00:00
Tony Sarajärvi
250dd8c84e Remove try_catch codes from macOS 10.11 scripts
Change-Id: I7690ae186729b3a180b1d38c298a861d981dbf5d
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:55 +00:00
Tony Sarajärvi
1c6abfae01 Remove try_catch from common linux scripts
Change-Id: I9c7b472fa4c448f40c9adc6cc8a0d84cb9c5e74c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:53 +00:00
Tony Sarajärvi
4492fd3268 Remove try_catch codes from Ubuntu 16.04 scripts
Change-Id: I4a377b8bc2a16d9b9c4123a9a4f623f1a6a7ae18
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:50 +00:00
Jani Heikkinen
7dbaf0c651 Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-19 05:04:32 +00:00
Qt Submodule Update Bot
a41519ddf9 Update submodules on 'dev' in qt5
Change-Id: I8de17a2a29f1190a819d6a461f0d2b4c416641a4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-19 05:04:27 +00:00
Liang Qi
26cf8950b8 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I6538504713bee35853419f14a110af1ba2a6b1e9
2018-03-18 19:01:17 +01:00
Joni Jantti
5d7972b73b Provisioning: Windows - Disable autoreboot
Windows machines currently reboot automatically in case of a blue
screen crash. This must be disabled to prevent problems with Coin.

Task-number: QTQAINFRA-1748
Change-Id: I64ac1cfa124694fab356b8443298c1b37bed9a92
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-18 16:22:17 +00:00
Tony Sarajärvi
85f874388c Revert "Provisioning: openSUSE - Set grub timeout to 0"
This reverts commit 2e329bc68e.
grub-update command isn't found, and after enforcing script
results, we have a P0 blocker here.

Change-Id: Iaf4b17a91cdc865974a5f4f196bbb80b085a39c2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 677524620d)
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-18 16:22:15 +00:00
Tony Sarajärvi
863252be49 Download get-pip primarily from our local cache
We should first download from our local cache,
and if that doesn't work, fetch it online.

This commit doesn't fix it per se, but as we download
it from our local cache, the version is the one
our shasum checksum matches against.

Task-number: QTQAINFRA-1876
Change-Id: Ia7de54cf090af47ba33111911582f9d48c0ab2a2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-18 16:22:12 +00:00
Tony Sarajärvi
64c79b27d6 Clean old RHEL repo data before fetching new data
Task-number: QTQAINFRA-1872
Change-Id: I49d9d1589adc5b34f1b7c2dccc14be0021f2baaa
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
2018-03-18 16:22:09 +00:00
Tony Sarajärvi
eebc0133f0 Disable update download in background
Task-number: QTQAINFRA-1852
Change-Id: I6d8e433fa40dd080fe84efcf3d0c655d14f86010
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-18 16:22:07 +00:00
Qt Submodule Update Bot
5533acdd78 Update submodules on 'dev' in qt5
Change-Id: I9b7acbf67f6af2e95db87585dcc70f4aecc5d503
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-18 09:13:24 +00:00
Qt Submodule Update Bot
7f4f29ab95 Update submodules on 'dev' in qt5
Change-Id: I2f90804140d6e15fc7c3e829a7b6c86611a496d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-17 19:36:15 +00:00
Tony Sarajärvi
209cb73a36 Use local RHEL repositories with RHEL 7.4
This will remove the majority of our network traffic from the outbound
connection while provisioning. Also proxy was removed for
yum, as there is no point in proxying local data.

As a side effect, this makes provisioning currently faster by
reducing the time it takes by 35%.


Task-number: QTQAINFRA-1849
Change-Id: Ida4fb86d4bef166fc72e521e395d9753ec47a687
Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-16 05:23:05 +00:00
Qt Submodule Update Bot
400371faba Update submodules on '5.11' in qt5
Change-Id: I9ad2fe2d1bad7d761b25de77d473994870aac960
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-16 05:22:45 +00:00
Heikki Halmet
23b4bcf6c5 Provisioning: Move http_proxy.txt under shared folder
Change-Id: Id5b2f07a92eadfb21fbfdb3fb65621d6322dc8c4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-15 15:07:27 +00:00
Heikki Halmet
237b308d47 Provisioning: Fix adb process name for android sdk installation
There's no process called "adb.exe" - It's called "adb"

Change-Id: I3c23ede12a6d7fc7f3f33bbb806a84e8d9a2aaf4
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-15 15:07:24 +00:00
Qt Submodule Update Bot
9bb3cde706 Update submodules on 'dev' in qt5
Change-Id: Icf3d9d788c45f93e6dbfc973d4cb6df6a66243cd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-15 06:17:16 +00:00
Qt Submodule Update Bot
280b08eb73 Update submodules on '5.11' in qt5
Change-Id: I6a0ad20fa97dabfbec8eaed990e844b26b20b353
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-15 05:10:50 +00:00
Qt Submodule Update Bot
573e4d5633 Update submodules on 'dev' in qt5
Change-Id: Iba60f4bbbfee4d7b0a14cac1ff36b03cb1c73c3f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-14 05:14:51 +00:00
Jędrzej Nowacki
8a47814c91 Simplify DownloadURL
The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e to a sourcing
script which was propagating through DownloadURL.sh to almost all
provisioning scripts. So it is good to avoid using it.

Change-Id: If191a0dcf52a29c4bec580a254e8e58a00130f6d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-14 05:12:41 +00:00
Qt Submodule Update Bot
8fae7aa66d Update submodules on '5.11' in qt5
Change-Id: I8234b4d7d7c54ed0020e6cd2fcdbaa07d33eb928
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-14 05:12:31 +00:00
Qt Submodule Update Bot
69dd54a8dc Update submodules on 'dev' in qt5
Change-Id: I4f2eee96b5ca23177816861cca3eb7ac0ea5e515
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-11 12:28:25 +00:00
Liang Qi
9494b39329 Update submodules on '5.11' in qt5
Change-Id: Ia27a0de06afe5de52eb026a5225e4d2caac0975c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-11 07:56:21 +00:00
Liang Qi
ec45725ef2 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1c443b44c8ebe41b84ca5bbbb9dc8884a8fdfa8a
2018-03-10 17:08:46 +01:00
Liang Qi
5bbeaf6c0d Update qtwebengine only
Change-Id: I1396d561892a5fead56775906ecd8aa7c48ba187
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-10 13:31:42 +00:00
Tony Sarajärvi
b85b272c26 Move MSVC2017 x86 builds to 64bit host OS
Change-Id: I7544c12086ef8a437bca575dfce7de44ec9938a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:40 +00:00
Rainer Keller
04d1ee1df4 Provisioning: Create symbolic for shasum tool on macOS for compatibility
On macOS the sha1 tool is named 'shasum' while on all other unix systems
it is called 'sha1sum'. In order to make all unix provisioning scripts
run on macOS without special case handling a symbolic link is created.

Change-Id: Ib1365cbb0dcb31e68a22959ce939fb450ec7e3f7
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:34 +00:00
Rainer Keller
00e3a0149a Properly download and install RHEL EPEL repo
Use the same approach as in the other scripts.

Change-Id: Ie48103e2c4a528a9d29318c4cabd6ead71dc5c2c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-10 13:31:30 +00:00
Rainer Keller
9cb66c0114 Install RHEL EPEL only once
Installing twice will fail when preventing the +e injection bug
when fixing the try-catch issue.

Change-Id: I26a1b9fa235c44fe933f2f29016a80f57d47ed49
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-10 13:31:27 +00:00
Joni Jantti
940ef0a4cc Provisioning: win8.1 - RTA required provisioning scripts
Currently Windows 8.1 platforms have been removed from CI. RTA
however still uses them for testing so we need to add the programs
that RTA uses.

Task-number: QTQAINFRA-1524
Change-Id: Ide9fa076dc965b16b96f610541ace6088543f795
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-08 19:27:18 +00:00
Heikki Halmet
3410bab278 Provisioning: Fix Squish installation for msvc14 32-bit
Task-number: QTQAINFRA-1809
Change-Id: I8a2947fe52535e39b0817fec2ee0c35bb09e4060
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-03-08 19:27:14 +00:00
Joni Jantti
95609c6657 Provisioning: Executequeueditems on Windows
mscorsvw.exe background processing is draining a lot of
CPU processing on Windows platforms. Executing the list
of to be processed items with full CPU capacity should
clear out the list and stop the background processing.

Task-number: QTQAINFRA-1775
Change-Id: Ib12bc10f4572390f20bfea915ca48ec398de46ee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-08 19:27:11 +00:00
Joni Jantti
3230cdb138 Provisioning: win10_x86 - Disable automatic updates
Task-number: QTQAINFRA-1814
Change-Id: I1fed4d952f77daa1c7bd5fdb34d9568ae1208bac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-08 19:27:09 +00:00
Maurice Kalinowski
7a052f4183 open62541: Fix provisioning for RHEL 7.4
RHEL does not use pkgconfig, nor does it use /usr/local/lib as default
library path. As a consequence, the config tests for qtopcua were not
able to find the open62541 build.
c3591fe77debc0eab79851bd8f0c050cd4f3f608 in qtopcua.git allows to
specify an environment variable to point to the correct location. Move
to /usr/local/lib/open62541/ on all platforms consistently.

Change-Id: I73c8076b70767553edfd793889150c584d5c33b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-03-08 19:27:06 +00:00
Qt Submodule Update Bot
984b15d758 Update submodules on '5.11' in qt5
Change-Id: Id00474dec78862dbce0238560e859656bd69f69f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-08 05:44:13 +00:00
Jędrzej Nowacki
bb9739773c Simplify openssl_for_android_linux provisioning script
The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e So it is good
to avoid using it.

Change-Id: I9e26e8fedad71d40270fe94695d5e1c09c3d9023
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-06 06:41:46 +00:00
Qt Submodule Update Bot
764294fcb8 Update submodules on '5.11' in qt5
Change-Id: I3f19c5b7daedfa7d499ab769404d1f34a32c7816
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-05 08:37:59 +00:00
Qt Submodule Update Bot
686e3ff1b5 Update submodules on '5.11' in qt5
Change-Id: Iebf77d7f467d0fde9ee622e4e7b657cb1e9b8003
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-04 09:53:17 +00:00
Qt Submodule Update Bot
b038a8c2bd Update submodules on '5.11' in qt5
Change-Id: I2ba427ea1d9e37421775c297d983654f3e691845
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-03 09:00:50 +00:00
Qt Submodule Update Bot
e926cd7556 Update submodules on '5.11' in qt5
Change-Id: I0b551c2af57243eee865cd4319ee1797dc38f705
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-02 21:34:42 +00:00
Jani Heikkinen
52b163092a Add missing 08-libclang.ps1 for windows7 provisioning
We need to set LLVM_INSTALL_DIR to be able to build qdoc. That was
missing from windows7.

Task-number: QTBUG-65950
Change-Id: I7f75eb0181056a2117080ead6dc5862324906689
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-01 07:17:27 +00:00
Qt Submodule Update Bot
d6d6318e98 Update submodules on 'dev' in qt5
Change-Id: Ia305f8493404ed258de43504a440c9cd5b2eac90
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-27 16:51:08 +00:00
Kari Oikarinen
140c6479b5 Install libusbx-devel for QDB on RHEL 7.4
On previous RHEL version the package was libusb1-devel. That package doesn't
seem to be there anymore, which presumably means why the package to install was
changed to libusb-devel. Unfortunately libusb-devel provides a compatibility
package for the old 0.1 API version and doesn't work with QDB. libusbx-devel
seems to be the new name for the 1.0 API version of libusb on RHEL.

Change-Id: I50a10bed0b73b536e5d591363f01d7cf6a3a69d7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-02-27 13:47:58 +00:00
Liang Qi
0f22ce6a71 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I45b92cefd7f14bbe99a6fa2d31b8d14bb41da21a
2018-02-27 11:27:21 +01:00
Qt Submodule Update Bot
399cface18 Update submodules on '5.11' in qt5
Change-Id: I7c090de84c5cf511ec7cea69900546edf6039c39
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-27 07:01:04 +00:00
Oliver Wolff
cb6709ce5c Unify Windows provisioning scripts & improve error handling
While Coin should also see exit codes != 0 as error, we should
stick to one way of handling script errors. As Power Shell cmdlets
signal an error by throwing an exception we should do the same
(and that approach also works in Coin).

Additionally extracting 7zip files was unified across scripts by
using the existing helper function instead of reinventing the wheel
again and again.

A similar helper function was introduced for starting an external
application (and handling its errors).

Also echo and other "cmd" commands were replaced by their PowerShell
equivalents to have a unified approach across our Windows provisioning
scripts.

Change-Id: I70129ce38692f1396c33c13b33a2918485fa5271
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-02-26 19:52:45 +00:00
Johan Klokkhammer Helsing
08c88de5c8 Provisioning: Build and install Wayland 1.12.0 on RHEL 7.4
So QtWayland will be built and included in the installer.

wayland-egl, however, will not be built, as that depends on support in mesa.

Task-number: QTBUG-66341
Change-Id: Id3f1825e00be9d278fce8ac2710a2640baafd332
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-26 19:52:41 +00:00
Johan Klokkhammer Helsing
51a87054d6 Provisioning: Install RPMs for mesa-wayland-egl on RHEL 7.4
The standard mesa.spec file had sections for wayland-egl, which were ifdef'ed
out. The RPMs downloaded by this script have been built with these ifdef's
removed.

Task-number: QTBUG-66341
Change-Id: I43bcc67f5fd112e0837d45da7df20bcb63bfd989
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-26 19:52:38 +00:00
Qt Submodule Update Bot
20b1d0a54b Update submodules on 'dev' in qt5
Change-Id: Ic951b2a9e44e299bedc4c6dc561d8f9e17de6544
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-26 09:54:33 +00:00
Qt Submodule Update Bot
8c790cd2bc Update submodules on '5.11' in qt5
Change-Id: I46be13c9983d30fb1e2461dbc795664600e0655a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-26 05:16:07 +00:00
Qt Submodule Update Bot
9c1ce66737 Update submodules on '5.11' in qt5
Change-Id: I2f9a24e295282514da028d8ff8d27e0de6326218
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-24 06:17:43 +00:00
Liang Qi
36d5e1a794 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie83ca342acce563e85620c3998ae7e9f74a7c4bc
2018-02-23 22:16:13 +01:00
Frederik Gladhorn
b20224fe60 Uninstall aptdaemon/aptd before using apt
This removes various kinds of update notifiers that depend on aptd.
Also gets rid of the problem that aptd may hold apt lock files.

Task-number: QTQAINFRA-1755
Change-Id: I27dd6fef4720ef25a504d76a3da16d9bf45fb2f7
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:32 +00:00
Joni Jantti
f6f00fdce1 Provisioning: Win7-x86 - Add msvc14_x86 squish package
Squish is required by RTA testing.

Task-number: QTQAINFRA-1732
Change-Id: I8ab0b11ccc299cc0b10e59f99d1cf27c0cdd48b9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:29 +00:00
Joni Jantti
f6f5cc70e9 Provisioning: openSUSE-42.3 - Disable update notifications
Update notifications need to be disabled to prevent popup messages
from stealing focus during testing.

Task-number: QTQAINFRA-1755
Change-Id: I202ffbee6420d2c9c167a97f02d5245145b618d0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:25 +00:00
Matti Paaso
c3b33afc32 Provisioning: osx-10.11 - Java
This is needed for running RTA jobs in Coin.

Change-Id: Iff855dae54babef00c055a2c8b938871101305e3
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-23 21:00:21 +00:00
Joni Jantti
5e31866727 Provisioning: Win10 - Add Squish for mingw53
RTA requires Squish for mingw53 on Windows 10 machines for testing.

Task-number: QTQAINFRA-1729
Change-Id: I42f2c6c62dd004ebc072835340ce24105cfac5e8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:19 +00:00
Joni Jantti
b1a212b52e Provisioning: Make Windows scripts use the Download helper function
Some Windows provisioning scripts use the Invoke-WebRequest without
setting the ProgressPreference = 'SilentlyContinue' variable for
disabling the download progress bar. Disabling the progress bar
greatly increases the download speed during provisioning.

Change-Id: I649c1bcc970577776d720a4ebf5a7af96c1603f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:15 +00:00
Tony Sarajärvi
54d8396d68 Set proxy on Windows VMs while provisioning
Task-number: QTQAINFRA-1669
Change-Id: Ia6b5b668051642a3729d7c7c83c69d8797045847
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:11 +00:00
Heikki Halmet
3a3c6fb2b3 Provisioning: Fix Windows 10 msvc 2014 squish installation
Change-Id: Id935580730d20a2f86fa6c82bf08ee3705f344f2
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:08 +00:00
Qt Submodule Update Bot
b17fcbe630 Update submodules on 'dev' in qt5
Change-Id: Ia6f8ec8bb3361419f6d50dbddb665e974a2f1fca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-23 09:08:49 +00:00
Tony Sarajärvi
ae17b63db2 Add shebang to launchable script
Change-Id: I62e33b656eee3a17e1dab4476569d9afa0b62a45
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-02-23 08:20:34 +00:00
Maurice Kalinowski
acbedcc314 Provisioning: Update Open62541
This is required to use new APIs from the library.

Change-Id: Idbadfd04c331af228a9e095e130930b5fb88f7af
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-02-23 08:20:31 +00:00
Liang Qi
238cb26099 Update submodules on 'dev' in qt5
Change-Id: Ia8de2d8c35a6a021fd22522a642caa82d960aed2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-23 06:31:08 +00:00
Liang Qi
3ba940924d Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: Ia450fbc4398a627ebb37646b408a0692cc970094
2018-02-22 09:06:19 +01:00
Qt Submodule Update Bot
8eed3b5be4 Update submodules on '5.11' in qt5
Change-Id: I1447f714aa1035c2cdbe423935cc5a67a700de2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-22 06:56:53 +00:00
Liang Qi
93ff678878 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib867a3e53f624b8963e6dab311fe5c2a28c87801
2018-02-21 09:57:48 +01:00
Liang Qi
91739f5fe3 Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
	coin/provisioning/common/linux/open62541.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
	coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh

Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
2018-02-20 22:33:59 +01:00
Oswald Buddenhagen
c64b2415d3 init-repo: complain about non-option arguments
otherwise abuse may go unnoticed (at this stage ...).

Change-Id: Ic8c2a843a941cdeb2d69542830eccf7fadcf252d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-02-20 11:20:20 +00:00
Matti Paaso
884490eaae Add RTA targets
Release Test Automation tests are ran also in additional targets
compared to qt5 targets.

Change-Id: I72ca86f875920ec266e0e6b7ea3fee026eaa1cfe
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-20 10:47:12 +00:00
Qt Submodule Update Bot
bcaeff8210 Update submodules on '5.11' in qt5
Change-Id: I069e5672ed40279dbbd8769be17f5cb328b12bc1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-19 07:15:40 +00:00
Qt Submodule Update Bot
060d0bdec1 Update submodules on '5.11' in qt5
Change-Id: I92f9401dc98ab115fe737ec5395025055830140f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-18 21:40:38 +00:00
Qt Submodule Update Bot
e086fbc6cb Update submodules on '5.9' in qt5
Change-Id: Ie7a64cad655dd0e850c8c6145f35b425de6f4c25
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-17 21:25:08 +00:00
Qt Submodule Update Bot
5186a96b47 Update submodules on '5.11' in qt5
Change-Id: I5253636ea9da20b20879f4863dc5b037842b9e7b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-17 10:52:39 +00:00
Liang Qi
ea28c00dd6 Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: I07cebe617c7860cbeede24b2f45c7c508aed5a92
2018-02-15 20:59:29 +01:00
Qt Submodule Update Bot
443328fa9f Update submodules on '5.11' in qt5
Change-Id: Ie33f91194895634fbf837210e534b78e7559989e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-15 13:51:31 +00:00
Liang Qi
c152f646db Update submodules on 'dev' in qt5
Change-Id: Icbb7b51a46c55ed4ec7690e6cdceedf4680f3b2f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-14 06:54:00 +00:00
Liang Qi
3d445e8b77 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iac3ddede9c1d6b0de5a30b3490d5564995afaabc
2018-02-13 21:18:24 +01:00
Heikki Halmet
404805141a Disable set -e when enabling devtoolset-4 environment variables
Change-Id: If427179da490f14963077cd733082258e354710f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-13 19:32:03 +00:00
Simo Fält
769a34ed26 Provision: Use specific Python2 version in macOS
Make sure we use some specific Python2 version on macOS instead of the
one pre-installed along with system.

Change-Id: Ifee07a8cf003e282ec3cb67535818f9fe39c8679
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-13 19:32:00 +00:00
Qt Submodule Update Bot
066373c9c6 Update submodules on '5.9' in qt5
Change-Id: I360edc60d8e2740d1964b91e18e02dc5daeea39a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-12 18:50:11 +00:00
Qt Submodule Update Bot
c77d4946b2 Update submodules on '5.10' in qt5
Change-Id: Ie45f18cc0c70cca437cadd8bfaa6e8a4ac0c81b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-12 08:16:58 +00:00
Qt Submodule Update Bot
9cb9e7654a Update submodules on 'dev' in qt5
Change-Id: Ibb42cbf10eb51d99e5d26a3e616bf488f9b5bd28
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-12 05:26:25 +00:00
Qt Submodule Update Bot
623528bf40 Update submodules on 'dev' in qt5
Change-Id: Id7d9342393bbf3068dd7a1c90dc2afe365d80962
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-11 19:13:43 +00:00
Jake Petroules
355252621c Remove macOS 10.10 from CI for Qt 5.11
As agreed, this version will not be supported any longer.

Change-Id: I37d9d9d9e32b5d17dbf0f80a6c42a8e233bcc446
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-02-10 19:15:51 +00:00
Qt Submodule Update Bot
a969ebdb84 Update submodules on 'dev' in qt5
Change-Id: If9edf8eca3865c32db056bb8f167dc47530c9d37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-10 07:47:38 +00:00
Qt Submodule Update Bot
5611fe34b0 Update submodules on '5.10' in qt5
Change-Id: Ica319a5d98406174ce94d2e3c3784364ab44c642
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-10 07:47:25 +00:00
Mitch Curtis
e30de965b9 .gitmodules: update recommended modules for qtvirtualkeyboard
The basic example will start using qtquickcontrols2, so recommend that.
Remove qtquickcontrols, as it wasn't used.

Change-Id: Ieaab1480e6a85ecaa24888fa58024d728d863a16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-02-09 18:36:54 +00:00
Qt Submodule Update Bot
f50cada914 Update submodules on 'dev' in qt5
Change-Id: I712f991abb4fb97e341133c295f2d77330a84a68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-09 13:14:52 +00:00
Qt Submodule Update Bot
b2b076782f Update submodules on '5.10' in qt5
Change-Id: I06c4afea4e574aa78f37009db512ba25194f6d5d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-09 12:47:17 +00:00
Qt Submodule Update Bot
f2dbac41cf Update submodules on '5.10.1' in qt5
Change-Id: Icac819f46b0faa05367d73e2435f98975bda2811
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-02-09 10:59:13 +00:00
Qt Submodule Update Bot
456a4d6453 Update submodules on '5.10' in qt5
Change-Id: I935d6ad075384973425d48782a105a9e3e7d21a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-08 09:31:00 +00:00
Joni Jantti
cadedac3b4 Provisioning: osx-10.11 - Disable sleep
Display sleep and system sleep need to be disabled to prevent the
machine from going to sleep during RTA testing.

Task-number: QTQAINFRA-1588
Change-Id: Idc91d77388ed9bc6df5f3c1aceca515f6308c618
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-08 08:04:47 +00:00
Joni Jantti
af55ddc913 Provisioning: MacOS-10.12 - Disable sleep
Display sleep and system sleep need to be disabled to prevent the
machine from going to sleep during RTA testing.

Task-number: QTQAINFRA-1588
Change-Id: I3dc1642d3714762bfb56963392d2bb5137c13256
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-08 08:04:44 +00:00
Qt Submodule Update Bot
25a19a1115 Update submodules on 'dev' in qt5
Change-Id: I29aba3e5aebc6ee4b2e130b70dbf184ad3d79303
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-08 07:30:24 +00:00
Oswald Buddenhagen
9c506a5164 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
2018-02-07 20:17:09 +01:00
Qt Submodule Update Bot
9680fa7860 Update submodules on 'dev' in qt5
Change-Id: If34630f163416a6ee7b34df5b7f41c47f8f5cfd1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 18:34:51 +00:00
Qt Submodule Update Bot
9d73a2b304 Update submodules on '5.10.1' in qt5
Change-Id: I88fa5fe223a0e32a3c0261342d490f00561c6497
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 16:00:46 +00:00
Liang Qi
6cd75cce72 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I71b7fd09cd8f1c7e64531eec8a645c06a7066325
2018-02-07 13:58:54 +01:00
Alex Blasche
d212f48b67 Remove QtOpcUA from qt5.git
This module is moved to tqtc-qt5.

Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
2018-02-07 11:32:54 +01:00
Liang Qi
da1189b867 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Icf5a559c89f572249cc1fd54d2c11319597afdf9
2018-02-07 10:14:50 +01:00
Liang Qi
25a0f1fa08 Merge remote-tracking branch 'origin/5.10' into 5.10.1
Change-Id: I275589752f6f623e61841a4552087a1875729615
2018-02-07 09:37:28 +01:00
Tony Sarajärvi
c3096caa14 Remove excess comment line for shellcheck
Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:47 +00:00
Tony Sarajärvi
b4b62658ac Fix environment variable checking for proxy
Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:44 +00:00
Qt Submodule Update Bot
052aa06ef4 Update submodules on '5.9' in qt5
Change-Id: I1254c80a58ec607af3cf3955b3c73e3fb30a516e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:41 +00:00
Joni Jantti
38649924df Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0
Grub timeout should be set to 0 so we save some time whenever the VMs
are booted.

Task-number: QTQAINFRA-1703
Change-Id: Ia866000703fdc083407d5d8588ba6680ffd80038
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:38 +00:00
Joni Jantti
9fa8b3ca35 Provisioning: openSUSE - Disable file indexing
Baloo file indexing sometimes takes up a great amount of CPU capacity
and should therefore be disabled.

Task-number: QTQAINFRA-1702
Change-Id: I549aef39c1dd2d2fa97196910f577153a42c4f54
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:35 +00:00
Qt Submodule Update Bot
0687514221 Update submodules on '5.11' in qt5
Change-Id: I8e2b737f940e5712c49eadf688983607e4ec349c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 05:40:13 +00:00
Johan Klokkhammer Helsing
532f1dea57 Provisioning: Don't test window decorations on Ubuntu 16.04 QEMU
Decorations were previously disabled within the Wayland tests to work around
another issue. That issue has now been fixed, and decorations have been enabled
again, but these tests now became flaky when run within QEMU.

Task-number: QTBUG-66173
Change-Id: I23b722ebc0719a2fd359ba5c3c57c66a887c06de
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-02-07 04:45:09 +00:00
Liang Qi
3279652635 Merge remote-tracking branch 'origin/dev' into 5.11
Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
2018-02-06 17:49:39 +01:00
Qt Submodule Update Bot
9a160d28d5 Update submodules on '5.10' in qt5
Change-Id: I818ad09e1071db0369823caf2cd18da601f3bd05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-06 01:02:56 +00:00
Qt Submodule Update Bot
f322d6047a Update submodules on '5.10.1' in qt5
Change-Id: Ide442890f290ee8ed14950c90f9a0f6852eebc62
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-05 09:17:54 +00:00
Liang Qi
0e4931a8af Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I3b299786e8500b0a8f2c197f7501f8e6e1cf29cf
2018-02-04 15:30:50 +01:00
Joni Jantti
2e329bc68e Provisioning: openSUSE - Set grub timeout to 0
Grub timeout should be set to 0 so we save some time whenever the VMs
are booted.

Task-number: QTQAINFRA-1703
Change-Id: I67db00d200dc3e5f94ed205b53bb0ca6e70bdd8d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-03 20:52:57 +00:00
Qt Submodule Update Bot
88811f882e Update submodules on '5.9' in qt5
Change-Id: I14c5e22d5c76b64a573fb32b71580e00c2a3eeba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-03 15:20:59 +00:00
Liang Qi
4cd14f4625 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3e4ae2508d632919db77af0f365eb25ace1a69e0
2018-02-03 11:08:26 +01:00
Qt Submodule Update Bot
d10baa6d3a Update submodules on '5.10' in qt5
Change-Id: Iefacfb5735b27e25a7e5eba595245f22a9ae07d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 21:53:38 +00:00
Heikki Halmet
4eaa017023 Provisioning: Disable Network Time Protocol
NTP need to be disabled from all tier2 templates

Task-number: QTQAINFRA-1608
Change-Id: I89e019c23b7a194efffa011200a8c870e3a65d66
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-02 07:14:40 +00:00
Tony Sarajärvi
7f7c87a15d Remove excess sourcing of try_catch
Change-Id: I3bfa7e8755dbae904719212c22549f6965142330
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-02 07:14:38 +00:00
Joni Jäntti
1583fbd2bb Add Win7_x64 provisioning for RTA purposes
Windows 7 x64 (Windows 7 msvc2013-x86_64) template
is needed since RTA is starting to deploy machines
from coin.

Task-number: QTQAINFRA-1521
Task-number: QTQAINFRA-1615
Change-Id: I7e9665bd37ee010a59ff3792f435d65eb9ad8c17
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-02-02 07:14:35 +00:00
Qt Submodule Update Bot
213b848cf5 Update submodules on '5.9' in qt5
Change-Id: I839f931dc0c3202543cfbc0137e7f54184efa037
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 07:14:32 +00:00
Maurice Kalinowski
f1422dc64b Provisioning: Switch download sources for mqtt paho broker
Internal resources are preferred and should be used first.

Change-Id: Ifd2a54858c9fb6b82c3dc268566c67238aad262e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:53 +00:00
Maurice Kalinowski
e33f38acef Update MQTT provisioning
Setting an environment variable has been centralized to a separate
script.

Change-Id: I027f9a71d32ee7f7d68575c9433f56a40a369deb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-02 06:22:49 +00:00
Qt Submodule Update Bot
29456af9b9 Update submodules on '5.10.1' in qt5
Change-Id: I00b96bfb3f93027136a770a25c7479b1902bcde4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-02 05:09:53 +00:00
Frederik Gladhorn
eb4fcfaba1 Instead of just warning that apt failed, tell why
With the lsof we should see which process was holding the lock.
After that we can disable this source of problems.

Change-Id: Ie6a014bdb101e6230139569c0e4ea51a57089c30
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-02-01 12:33:16 +00:00
Qt Submodule Update Bot
704b2387de Update submodules on 'dev' in qt5
Change-Id: Ie2e621ae2c2387c7daa0c29c5e04c8928fed169b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:37 +00:00
J-P Nurmi
13be05c06d Swap qtquickcontrols vs. qtquickcontrols2 statuses
The Qt Quick Controls (1) module, which was still listed as an essential
module, has not been actively developed for almost three years. Promote
Qt Quick Controls 2 as an essential module instead, and demote Qt Quick
Controls (1) as an addon.

Change-Id: If51c6c17d199ca10a574053d7dba67539a764aba
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:17 +00:00
Frederik Gladhorn
b032d87632 Revert "Adjust submodule branches"
This got merged accidentally.

This reverts commit 282899453d.

Change-Id: I1457513217e636aa54b43a1dc21b01443c798119
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:10 +00:00
Frederik Gladhorn
282a4f0a35 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I30587abcc4062808e13570ff2a158a0fdc60cad2
2018-01-31 08:35:46 +01:00
Frederik Gladhorn
61cd31a5e3 Provisioning: Fix location of sw_versions.txt
I did not see this in the previous direct push.

Change-Id: I620dcc7f1c562e5bd9e09d479a4a5b8598a970fb
2018-01-31 08:32:41 +01:00
Frederik Gladhorn
250e07e99a Merge remote-tracking branch 'origin/5.11' into dev
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
2018-01-29 14:10:44 +01:00
Frederik Gladhorn
a434f14bd9 Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/common/windows/libclang.ps1

Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
2018-01-29 14:06:05 +01:00
Frederik Gladhorn
351a519340 Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
2018-01-29 13:44:48 +01:00
Frederik Gladhorn
485244b016 Merge remote-tracking branch 'origin/5.9' into 5.10.1
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.

Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-01-29 13:34:28 +01:00
Heikki Halmet
00e31823d3 Provisioning: Attach subscription to system
Subscriptions need to be reattached when subscriptions have been
renewed by Red Hat.

Directly pushed to get provisioning into working shape.

Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Change-Id: I6e469d7fac3b848193f280702e1e807ce4ea096b
2018-01-29 13:31:17 +01:00
Allan Sandfeld Jensen
18b5dbf7df Add a MSVC2017 platform to the default tested
Is needed for qtwebkit and qtwebengine testing and added in dev, where
MSVC2013 was removed to not add additional pressure on the CI.

Task-number: QTBUG-65830
Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-26 15:49:50 +00:00
Oswald Buddenhagen
3504be0d83 Adjust submodule branches
Change-Id: If777dfa31ad635b8a2a6cb98d65c0be5f6e39a39
2018-01-26 16:00:53 +01:00
Heikki Halmet
462a2aae2b Provisioning: Add Squish provisioning for Release Test Automation
Squish is required by RTA for testing.

Task-number: QTQAINFRA-1523
Change-Id: I0c3653565f19cc9b798a0b63325c47b017cf5537
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-01-26 13:12:51 +00:00
Heikki Halmet
dc5f851e78 Provisioning: Add common shared folder
Common shared folder includes scripts of files which are common for all
operating system families. Changes under shared folder will trigger
provisioning for all platforms

Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4
Task-number: QTQAINFRA-1451
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-26 13:12:47 +00:00
Tony Sarajärvi
c4cf4fa07f Add nfs-common for mounting to work
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-26 13:12:44 +00:00
Joni Jantti
6d1190aaa0 Provisioning: Use SetEnvVar helper function in scripts
Currently when adding an environment variable in provisioning we have
to check if the system is Ubuntu and use .profile instead of .bashrc.
This check should be done in a function so we don't have to duplicate
it for every provisioning script separately.

Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-26 13:12:41 +00:00
Qt Submodule Update Bot
7681e742d7 Update submodules on '5.9' in qt5
Change-Id: Ie34e726ef71d33bb0726a10886edd3153783376a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-26 13:12:39 +00:00
Liang Qi
3c3d56c0cc Update submodules on '5.10' in qt5
Change-Id: I7823fe54729d3b385e11b1a2f7b6f6cfec6ebe55
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-26 07:54:42 +00:00
Qt Submodule Update Bot
c0b7daeb10 Update submodules on 'dev' in qt5
Change-Id: I3b1e1f1b46d3cb067e335ce1bef0da3046afed8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-24 23:01:47 +00:00
Oswald Buddenhagen
282899453d Adjust submodule branches
Change-Id: Id6fe05f393152581b8509fd613084df1f318bc54
2018-01-24 17:49:00 +01:00
Samuli Piippo
953dc011b2 Enable ARM64 build for QNX7
Change-Id: Ic30f4032c73ec16a9f1b93b3afee1e9812074bb7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-24 10:24:13 +00:00
Qt Submodule Update Bot
352b30a15d Update submodules on '5.10' in qt5
Change-Id: I92a54351148ee369eaacca6064c12b73f18be4da
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-24 08:55:01 +00:00
Qt Submodule Update Bot
e32dd4fe58 Update submodules on '5.10' in qt5
Change-Id: Id21e7a1007ee9ea956431fe84890337074271f7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-23 07:58:13 +00:00
Qt Submodule Update Bot
fc840c3459 Update submodules on 'dev' in qt5
Change-Id: Id6db5f3aa546198917e3e14e53c47126c9f4a012
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-23 05:21:41 +00:00
Frederik Gladhorn
052b4b5844 Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
2018-01-22 12:19:10 +01:00
Qt Submodule Update Bot
b6a1e9f07e Update submodules on '5.10' in qt5
Change-Id: I9405e2dc8a6a93cbf5d7f86d8dbfd9a96c8b41b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-21 07:36:34 +00:00
Qt Submodule Update Bot
09ec294210 Update submodules on '5.9' in qt5
Change-Id: Iaadacb41390a5b028d99d4427895af6529b13b59
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-20 14:27:18 +00:00
Qt Submodule Update Bot
5f57762934 Update submodules on '5.10' in qt5
Change-Id: I0a49d2eb0c8a7b7a16aa32ba24924299f6d40270
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-20 14:19:44 +00:00
Tony Sarajärvi
dc1560dbef Add dependencies needed to build Yocto
Task-number: QTQAINFRA-1690
Change-Id: I9583c39709849d058e6d44473e074e9327907dd8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-01-19 11:29:58 +00:00
Liang Qi
45528e6874 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
2018-01-19 09:56:46 +01:00
Qt Submodule Update Bot
4319f7da72 Update submodules on 'dev' in qt5
Change-Id: I6a9db841c7c6c9eba6248072caa8069dacb853da
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:26:04 +00:00
Joni Jantti
786be66eaf Move exception throw to the correct line
This throw was placed on the echo line instead of the actual command.

Change-Id: I907c2ce17afa64c9c4ef628d766d7dfe270ade59
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-19 05:25:09 +00:00
Qt Submodule Update Bot
31a0826fe8 Update submodules on '5.9' in qt5
Change-Id: I48a99c5161698f833ab0f0798690e5fa963057d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:25:02 +00:00
Qt Submodule Update Bot
21e7344389 Update submodules on '5.10' in qt5
Change-Id: I7b7796d1651b5b1384f543b9e64c0c836113689c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:24:06 +00:00
Liang Qi
57ba8230bd Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: I1c5c5e6e938f33dd8b0b9c40e64d509eeec25774
2018-01-18 23:41:16 +01:00
Oliver Wolff
99595f44f1 Provisioning: Fix disabling windows updates
On some machines the updates were already disabled, which lead
to the call to disable the service failing. Now we just move on without
error.

Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-18 21:08:25 +00:00
Frederik Gladhorn
b86b3a757b Fix provisioning: NotePad++ path on 64 bit windows
We install the 64 bit version of np++ which is installed in the regular
program files folder.

Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-01-18 21:08:21 +00:00
Frederik Gladhorn
b1198d3402 Fix provisioning: Wait for msvc-2013 update 5 to finish
Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)...
Removing C:\Windows\Temp\vs12-kb2829760.exe ...
Caught System.UnauthorizedAccessException
Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied.

Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-18 21:08:19 +00:00
Tony Sarajärvi
7c66e59832 Add nfs-common for mounting to work
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-01-18 16:33:18 +00:00
Tony Sarajärvi
f2f9b14cee Consolidate provisioning script name for qnx in macOS
Change-Id: Id07686bcc677b62a4981a46cabefd40b544815c5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-18 16:33:13 +00:00
Liang Qi
762530ba70 Update submodules on 'dev' in qt5
Change-Id: I30571e17dc4fafbaf66232546bf33ba4965d36e8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-18 07:21:08 +00:00
Qt Submodule Update Bot
b22fccf5ba Update submodules on '5.10' in qt5
Change-Id: Ibbbd5202c450921ba47c33e28034fce631e82546
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-18 05:14:41 +00:00
Jani Heikkinen
2348ead529 Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries"
Now debug symbols are added in qtlibs as well and library size
is huge. We need additional 'separate_debug_info' flag in
addition to this but currently there isn't support for it in
coin. That's why we need to revert this change until coin has
full support for this.

This reverts commit b0b6b05b34.

Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-01-18 05:09:07 +00:00
Qt Submodule Update Bot
8aec4db6a6 Update submodules on '5.9.4' in qt5
Change-Id: I21728a4b47373450defe1a90bd9bcf4680f323af
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-18 05:09:01 +00:00
Oliver Wolff
e33ef922ba Use "correct" registry when enabling Windows 10 Developer Mode
As coin is running a 32 bit application the registry key ended
up in the Wow6432Node compatibility area of the registry when run
on a 64 bit Windows. Windows does not use this place to check
for the developer mode setting, so we use the "proper" registry
instead.

If adding the registry key fails the script now reflects that
and exits with a proper exit code.

Change-Id: Ifd6bc7e7b0ed6595a2a967597ab45053cb51e7aa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-17 16:47:54 +00:00
Qt Submodule Update Bot
b55370e356 Update submodules on '5.10' in qt5
Change-Id: I986f33a9a04f1172c5fbfe37a45f984837a2a684
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-17 13:14:49 +00:00
Frederik Gladhorn
6a875b9f81 Fix checksum for QNX 7 SDK download
Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-17 12:20:52 +00:00
Qt Submodule Update Bot
d1aeb5c569 Update submodules on '5.9' in qt5
Change-Id: I0e7cb3a46909c3b72e2639b9ef2214428bd02cb6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-17 12:15:25 +00:00
Qt Submodule Update Bot
5ee73db243 Update submodules on '5.10' in qt5
Change-Id: I43c91914547bb1b27f29ce948707eaf4b8373825
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-16 08:01:20 +00:00
Qt Submodule Update Bot
113ad91c98 Update submodules on '5.9.4' in qt5
Change-Id: I103ce41b4b7c576e36b43215401e83e43a0e522e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-14 17:28:22 +00:00
Liang Qi
1c7ba877cc Move QNX 7 arm build from qt5 to default
QNX 6.6 builds were removed. We need to check QNX in submodules
build.

This change amends 357de3ea13.

Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-14 08:59:49 +00:00
Qt Submodule Update Bot
1540a87590 Update submodules on '5.9' in qt5
Change-Id: I968ccd381929d89ef988d3ac2f468b25cbeb8365
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-13 15:41:12 +00:00
Heikki Halmet
6e4f2f8433 Fix common folder paths for common split change
Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-13 07:31:51 +00:00
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
4175522924 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Idf9c18da5527327178887c257fc56dbc27e1c8ad
2018-01-12 12:06:07 +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
Tony Sarajärvi
1c1557aa93 Provisioning: Set CMake to PATH on Ubuntu
Ubuntu uses .profile file instead of .bashrc. We need to use
the correct file accordingly.

Task-number: QTBUG-65594
(cherry picked from commit 22e4664eb0)
Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-09 19:20:44 +00:00
Qt Submodule Update Bot
5f022e5785 Update submodules on '5.9.4' in qt5
Change-Id: I9d1b498fc931464636734fc30b7852645383fc9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-09 19:20:30 +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
Qt Submodule Update Bot
3bfa9b0b12 Update submodules on '5.9.4' in qt5
Change-Id: Id238fb2be13cf7782a225e43e1d31ab195f56007
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-05 23:06:52 +00: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
Qt Submodule Update Bot
a7ebfbda72 Update submodules on 'dev' in qt5
Change-Id: Ic5a5a6acb55c5d5bac5ef7146c12c699a2b99948
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-29 11:40:27 +00:00
Lars Knoll
62efcd0c0a Temporarily remove two platforms from the qt5.git build
This is required to get a qt5.git update through, where we're having
a catch22 problem. Current qtbase in qt5.git gives compile errors on
some of the tested platforms, while qtdeclarative has test failures
due to (correct) changes in qtbase. So we can't merge the fix for
declarative without updating qt5.git, and we can't update qt5.git
without having that fix merged.

Change-Id: I87f79f6312a6ee2226aeb7b6868fd280ab087bcc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-29 11:40:12 +00:00
Joni Jantti
d29192ad3f Add set -ex to provisioning scripts for openSUSE-42.3
Change-Id: I71fb0074bc07ce3085401ac23be77ea32e52dcfa
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:40 +00:00
Joni Jantti
ca89bec297 Add set -ex to provisioning scripts for RHEL 6.6
Change-Id: I6e6e66cffcbd84af1e093176d65751063492122b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:33 +00:00
Joni Jantti
66595488f0 Add set -ex to provisioning scripts for Ubuntu-16.04
Change-Id: Icc4b58080875255d8c2efe3e5db2c05e18127606
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:29 +00:00
Joni Jantti
28bf922739 Add set -ex to provisioning scripts for macos-10.12
Change-Id: Ieea4f84909c552728614a4d3c23d4c8ab9134fb2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:25 +00:00
Joni Jantti
cec7c07283 Add set -ex to provisioning scripts for osx-10.10
Change-Id: I732df317aa0016b1d970e0d37167a3fc9276a645
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:21 +00:00
Joni Jantti
b23faee265 Add set -ex to provisioning scripts for osx-10.11
Change-Id: I56ecd39a553b8b777eac0f8822cfd3263e972ef5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 22:11:17 +00:00
Tony Sarajärvi
70d3800aab Remove provisioning of ICU for VS2012
Visual Studio 2012 isn't used in our builds.

Change-Id: I7f2480a1811efd1c1f164f468407ab55d5c4102d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:13 +00:00
Tony Sarajärvi
fb282b2e58 Provision fbx to RHEL 7.4 for 3DStudio
Change-Id: I2aaad4abc2e3d42bdd1f5204d20ee4fea3c0388f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:08 +00:00
Tony Sarajärvi
1399d6e130 Add set -ex to provisioning scripts for RHEL 7.4
Task-number: QTQAINFRA-1659
Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 22:11:03 +00:00
Joni Jantti
66f9718ebb Provisioning: Clean and move Win8 mqtt scripts to Win8.1
mqtt scripts need to be moved to Windows 8.1 directory from Windows 8.

Change-Id: Idc1b116f608e8cc8ae0a37713661d35b55b26a3a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 11:29:37 +00:00
Joni Jantti
dc0d045c17 Provisioning: Move open62541 from RHEL 7.2 to RHEL 7.4
5.10 -> dev merge switched from RHEL 7.2 to 7.4 and the open62541
provisioning script was left behind to the RHEL 7.2 provisioning
directory.

Task-number: QTQAINFRA-1666
Change-Id: I5c325dae63cb14a9935ddce5f3f751bd62df0ba2
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-12-27 11:29:35 +00:00
Tony Sarajärvi
357de3ea13 Drop QNX 6.6.0 verification from the CI
Task-number: QTQAINFRA-1378
Change-Id: Icc5fb21b6430c916ceecb8d5a504d40938931b06
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 11:29:31 +00:00
Qt Submodule Update Bot
2d71b84893 Update submodules on '5.9' in qt5
Change-Id: I88561b7971943d494f81fe309d849f5c0d94d2e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-24 00:57:34 +00:00
Liang Qi
1bba397539 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh

Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
2017-12-22 21:37:24 +01:00
Simo Fält
de0d7005cc Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5df4ec2ec9)
2017-12-22 15:22:27 +00:00
Oswald Buddenhagen
a0bf828433 Adjust submodule branches
Change-Id: I3d6535fee48d27c87aab32847f5486a331402df1
2017-12-22 12:57:22 +01:00
Tony Sarajärvi
88a1c161e5 Remove unneeded OS X provisioning scripts
Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-22 05:21:27 +00:00
Jani Heikkinen
21cbacf4b4 Remove 'Packaging' flag from builds we don't need it
We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit
so we don't need 'packaging' flag there either

Task-number: QTBUG-65324
Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-12-22 05:21:20 +00:00
Qt Submodule Update Bot
dd7f4112fd Update submodules on '5.9' in qt5
Change-Id: Ice93ecfe5e5c093c7bf455c05b87383cf157ed2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-22 05:21:14 +00:00
Liang Qi
730e2c9b0b Revert "Temporarily disable android build on macOS 10.12"
Bring android build on macOS back.

This reverts commit b6249e89fa.

Task-number: QTQAINFRA-1660
Change-Id: I510894cf6bdc7089fea140e3702e5246a6617787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-21 16:55:12 +00:00
Simo Fält
5df4ec2ec9 Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: Ifae45ce36b5739cea5124eae04e08472ebe9414a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-21 16:55:09 +00:00
Liang Qi
ba6ae3be9a Revert "Temporarily ignore qtcanvas3d"
QtCanvas3D adapted to new internal api in qtdeclarative.

This reverts commit 146bda6468.

Task-number: QTBUG-64766
Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:41 +00:00
Liang Qi
6b7ee9a8f0 Update qtcanvas3d only
Task-number: QTBUG-64766
Change-Id: I2ae55f0f4e38ffb98964f960c323334a9049936f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:38 +00:00
Liang Qi
b6249e89fa Temporarily disable android build on macOS 10.12
Need to be re-enabled when correct fix landed.

Task-number: QTQAINFRA-1660
Change-Id: Ifefb019016322ebf2e7c4ec9320e58555c6918e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 06:39:05 +00:00
Liang Qi
146bda6468 Temporarily ignore qtcanvas3d
qtdeclarative changed internal API.

Task-number: QTBUG-64766
Change-Id: I7a0bbcaf121bf852fc028be275e82a5658c132a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:39:02 +00:00
Liang Qi
b5e287b93b Update submodules on 'dev' in qt5
Change-Id: Ia91b548e08a7d84f47116b79265618ff9d4d8005
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:58 +00:00
Simon Hausmann
d55baf5baf Simplify apt package installation and disable daily package maintenance
Instead of using aptdcon, we can continue to use apt-get to install the
software. We just need to make sure that the automatic update and
package upgrade services are disabled. This is generally desirable as we
do not want these kind of activities to occur in the background while
building or running tests.

This also fixes the broken package installation via regex, which apt-get
supports but aptdcon does not.

Revert "Fix Ubuntu 16.04 random provisioning fail"

This reverts commit 537ea17d14.

 Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-12-20 06:38:30 +00:00
Qt Submodule Update Bot
41edaa5fb9 Update submodules on '5.9' in qt5
Change-Id: I85ef0fa0ae59f600ab53e9b566a08b2f22184f33
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:26 +00:00
Qt Submodule Update Bot
a4adb7f7d6 Update submodules on '5.10' in qt5
Change-Id: I84aaff41d77d31eb5c4c9aae973aaccd879ede3e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-20 05:38:34 +00:00
Konstantin Tokarev
b3d3adc541 Add libxml2 and libxslt to RHEL 7 for QtWebKit
Change-Id: I5c50ee482aa20f0d9959915c81d2c44cccce6dca
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-19 22:10:34 +00:00
Qt Submodule Update Bot
2e75f02a3f Update submodules on '5.10' in qt5
Change-Id: I7d7808d588470cbb2712cbda34a0c1bcc5730d11
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-19 12:00:51 +00:00
Konstantin Tokarev
2ee0364139 Add GStreamer libraries to openSUSE for QtWebKit and QtMultimedia
Change-Id: Ia40bb35687bbe1ecb429c042d4acfa22599b69b8
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-12-18 18:18:04 +00:00
Albert Astals Cid
04f8860d8c Install cups-devel in OpenSuse
This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch

Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-18 10:58:10 +00:00
Qt Submodule Update Bot
0ae61f0f4d Update submodules on '5.9' in qt5
Change-Id: Ibdf2e0ca968b4fa5c0a5be8c6bfc1d05aa90d17d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-18 05:26:11 +00:00
Qt Submodule Update Bot
9236cd01a2 Update submodules on '5.10' in qt5
Change-Id: I8514e3e83b62ae4ddc527eb73bcfdcd138ac1875
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-16 07:19:34 +00:00
Tony Sarajärvi
ae6ea5349f Remove Windows 8 provisioning scripts
They are replaced by 8.1 scripts.

Change-Id: Ib04c183b75cec2c6e529945f382c53fdeb23f213
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-12-15 11:03:06 +00:00
Konstantin Tokarev
f5dfdedb2d Add libxml2 and libxslt to openSUSE for QtWebKit
Change-Id: Iafb89bf9c12cf1d38c2fe1944d55965319b85ea3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-15 11:03:03 +00:00
Tony Sarajärvi
547a0ded90 Provisioning: Update default compiler to GCC-7 in openSUSE 42.3
Task-number: QTQAINFRA-1258
Change-Id: Ia2683a23ecc55aae4e82f901f446d1cf46895269
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-12-14 17:59:45 +00:00
Tony Sarajärvi
df7255ce44 Swap ICC builds to use system's SQLite library
Task-number: QTBUG-64650
Change-Id: I2c692ae04f0cc02a5fecb12e3a7b905ee89b1af9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-14 17:59:31 +00:00
Qt Submodule Update Bot
3bcc9a9181 Update submodules on '5.10' in qt5
Change-Id: I6c96508c89b6acab297d4f486b3b8966e28e4eee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-14 17:59:21 +00:00
Liang Qi
def11da274 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
2017-12-14 11:49:07 +01:00
Liang Qi
475fc2c2ad Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.gitmodules

Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
2017-12-13 23:28:56 +01:00
Heikki Halmet
b16eac13e6 Provisioning: Remove Android script from Red Hat 6.6
Android linux builds are run by Red Hat 7.4

Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 19:41:39 +00:00
Jani Heikkinen
b0b6b05b34 Add 'ForceDebugInfo' -flag to linux desktop binaries
Add 'ForceDebugInfo' for RHEL 7.4 as well

Task-number: QTBUG-3934
Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-12-13 19:41:28 +00:00
Joni Jantti
1dee4e9fca Fix broken and duplicate Ruby provisioning
Ruby is being installed twice on certain Windows platforms and the 32
bit versions of these don't have a working PATH addition.

Task-number: QTQAINFRA-1632
Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 19:41:24 +00:00
Qt Submodule Update Bot
0565e759c5 Update submodules on '5.9' in qt5
Change-Id: I0a5c2de981acb71511041c19f5ff966b87932367
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-13 19:41:24 +00:00
Heikki Halmet
d06d1081c0 Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
(cherry picked from commit adcdf7b49f)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-13 06:02:54 +00:00
Heikki Halmet
44eaaf374a Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: I2f9ce5a094ffe4d07e8bd138c0dcc150d0d916e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit beb73056c3)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-12 16:51:39 +00:00
Liang Qi
c98db75188 Merge remote-tracking branch 'origin/5.9.3' into 5.9
Change-Id: I01a6ee1ecfaabe56e585194ccfab3b25fbd89e8b
2017-12-11 12:31:12 +01:00
Liang Qi
eccfaf1f50 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ica3e7340f572140020318c6e22397fad393f9b15
2017-12-11 12:11:51 +01:00
Liang Qi
91df8a3a8f Fix syntax error - not use comma in platform_configs
ammends d9f2fe1b7f

Task-number: QTQAINFRA-1636
Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-11 10:00:50 +00:00
Qt Submodule Update Bot
e067ea2a72 Update submodules on '5.9' in qt5
Change-Id: Ib3d4ff60bd232362ca0cf1ad455f09c83643387d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-11 05:46:41 +00:00
Allan Sandfeld Jensen
35db81f33e Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: I66a737457cb9dd5f2cc53d64f639037926a560ca
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry-picked from 9a9d798ce4)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-12-10 12:56:35 +00:00
Liang Qi
c2c45640e0 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/common/install-commandlinetools.sh
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh

Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
2017-12-09 23:09:15 +01:00
Joni Jantti
828f82b6f0 Add missing name prefixes for Win7 provision scripts
The prefix numbers were missing for Ruby and QNX patch scripts.

Change-Id: I687b244c4657e17c32f0cc8221d3fb0ad3c5578d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:26 +00:00
Tony Sarajärvi
74dd14ae83 Remove provisioning scripts from non existing platform
Change-Id: I01ecb0a9d4050b88fc5010f5a31baa6e776c1848
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-09 18:48:21 +00:00
Joni Jäntti
77fdde0de9 RHEL7.4: install packages in one yum instance
Currently we are opening and closing a yum instance for every package
we install during provisioning. This is a bit inefficient so it's
better to install them in one go.

Task-number: QTQAINFRA-1586
Change-Id: Idbf814f9023da0fe8213b2ed84cd1a27a149fc27
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:15 +00:00
Joni Jäntti
5089c4468f Fix mesa_llvmpipe provisioning script for x64 Windows
This script doesn't extract the dll to System32 on a x64 system.
Calling "sysnative" doesn't seem to work with the custom function being
used.

Change-Id: Iea734a400d8c095ea2e3fe54f38e4756fba406f9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:11 +00:00
Heikki Halmet
b12a1591c4 Provisioning: Install signing tools to Windows
Signing tools are needed when signing offline installers

Change-Id: I98f12e3fdf01d273dff5fda0c2e34707174c6eae
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-09 18:48:05 +00:00
Qt Submodule Update Bot
a0e1f4f480 Update submodules on '5.10' in qt5
Change-Id: I428bbebe2b5e86e6ed7150080ab3ced2a6077fb8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-09 13:48:21 +00:00
Liang Qi
7d04dc1a29 Move INTEGRITY build from qt5 to default
Many failures in qtbase on INTEGRITY happened recently.

Change-Id: Ic55259e694961a53199d30f095159728207f8824
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:59 +00:00
Liang Qi
d9f2fe1b7f Add b2qt developer build for qtbase
Because we had enabled this for qtdeclarative before.

Change-Id: I1efd438ebf51b2e632d3f8f39bd707e7eb5a282e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:56 +00:00
Tony Sarajärvi
5d9e2c49d1 Update ICC compiler from 2018 to 2018 update 1
Change-Id: I2e44c98114afe559e4490d9b9ec3e1d19d7f4696
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-08 20:05:54 +00:00
Heikki Halmet
b6a1fc6aae Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit beb73056c3)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 10:53:42 +00:00
Liang Qi
8ab923d0e5 Update submodules on '5.9' in qt5
Change-Id: I5f68733c3c00ae4c2d1d23898552c1d2f91dee14
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-05 07:36:21 +00:00
Liang Qi
1f4d727570 Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I8d8c6b21a68caf28913934141f6b1f98be0ff369
2017-12-04 14:17:33 +01:00
Qt Submodule Update Bot
f8712c099d Update submodules on '5.10' in qt5
Change-Id: Ifd29751e627dbefb3f93c5f3ce4ff2cfec5d59fb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-03 15:43:51 +00:00
Heikki Halmet
adcdf7b49f Provisioning: Install Devtoolset-4 to Rhel 7.4
Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-12-01 17:55:19 +00:00
Qt Submodule Update Bot
6e54086be5 Update submodules on '5.10.0' in qt5
Change-Id: I398ac279c6a6065e12c953ae129cfcc98e37388a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-01 07:03:38 +00:00
Qt Submodule Update Bot
60f02cdfae Update submodules on '5.9' in qt5
Change-Id: I133cfe933eb47073931c183fa56c540c06471ad6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-30 21:51:44 +00:00
Qt Submodule Update Bot
2b7b098700 Update submodules on '5.10' in qt5
Change-Id: I88c38e77cad31acd45bb0ffea14fbfee48d5ee4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-30 09:35:36 +00:00
Qt Submodule Update Bot
6d37fda8c1 Update submodules on '5.9' in qt5
Change-Id: I9938183f8c87a6bd34989c37045b5df8803b15d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-30 05:01:05 +00:00
Heikki Halmet
cdbd177b41 Provisioning: Install bluez-libs-devel
bluez-libs-devel is needed to enable Qt Bluetooth

Task-number: QTBUG-64782
Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-30 05:00:51 +00:00
Tony Sarajärvi
92a7d95947 Fix indentation in platform configurations
Change-Id: Id4a7bec02b0ee1156e80667538a29ca2baf4cfed
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-30 05:00:39 +00:00
Heikki Halmet
f1db104ff9 Provisioning: Install bluez-libs-devel
bluez-libs-devel is needed to enable Qt Bluetooth

Task-number: QTBUG-64782
Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0
(cherry picked from commit 9b722f9df91c4f7a6ca24d3ad18e68e3a76b137b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-29 15:25:35 +00:00
Qt Submodule Update Bot
ed0f440974 Update submodules on '5.10.0' in qt5
Change-Id: I97468b13eeba051ff2c59162dfb3855a2c8e838e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-29 15:25:32 +00:00
Edward Welbourne
6675a8f416 Add missing shbang to cmake provisioning script
It was given execute permissions when renamed recently; but the
bash-isms in it will only work with that if it uses bash.

Change-Id: I61468257210ba586fdaf1e79531bae0492f9e8ae
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-29 12:03:31 +00:00
Qt Submodule Update Bot
eb3b287df1 Update submodules on '5.10' in qt5
Change-Id: I49d2ac31b572687781d8b1006f64206f57f3890a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-27 07:15:37 +00:00
Qt Submodule Update Bot
8baf4c994e Update submodules on '5.10.0' in qt5
Change-Id: I305d3f429ad7cc3650c26640b4da6077afc796af
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-26 02:00:31 +00:00
Heikki Halmet
beb73056c3 Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-26 02:00:23 +00:00
Liang Qi
bc16944191 Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Conflicts:
	.gitmodules
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/mqtt_broker.sh

Change-Id: I3bfaa9531a4b62426ec276c764ffda5cffcbdcaa
2017-11-25 16:40:50 +01:00
Qt Submodule Update Bot
fdfe9e05ba Update submodules on '5.10' in qt5
Change-Id: Ibcd840cc4135dc1860facbe2176555662eabc55a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-25 15:37:24 +00:00
Allan Sandfeld Jensen
9a9d798ce4 Add NSS to RHEL 7.4
Needed by QtWebEngine

Change-Id: Ieed87170eccc288523bc966dab1a25025c37abfa
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-25 13:26:30 +00:00
Qt Submodule Update Bot
f60bc7aa9d Update submodules on '5.10' in qt5
Change-Id: I76ddfac0ffac176a5d63b83bf13c4bacac8babbe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-24 06:46:36 +00:00
Qt Submodule Update Bot
f113a65c6e Update submodules on '5.10' in qt5
Change-Id: Ib454b91cd68ec6c109fe007b6667771a006ee95c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-23 17:28:14 +00:00
Qt Submodule Update Bot
5a4b7a56b8 Update submodules on '5.10.0' in qt5
Change-Id: Ia7b0ea9299a26d9e10a859e8d977d24f9cc22dde
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-23 12:46:44 +00:00
Qt Submodule Update Bot
e6ddce15c3 Update submodules on '5.10' in qt5
Change-Id: I12db3b69a01215489142b271976e33050874bf5b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-22 07:52:43 +00:00
Qt Submodule Update Bot
9468be52db Update submodules on '5.9' in qt5
Change-Id: I60dd3f3e809e3c82bc3216948e8a487c77ebb890
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-21 09:20:21 +00:00
Qt Submodule Update Bot
5d6f3486bc Update submodules on '5.10.0' in qt5
Change-Id: I29389744d77591850f3b50ba5bec3b97bd5865b0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-21 09:19:30 +00:00
Qt Submodule Update Bot
208baeb301 Update submodules on '5.10' in qt5
Change-Id: I6c6623f1d66a65e6d3eadeda6acb2bfee9996b6d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-20 20:10:15 +00:00
Liang Qi
47bf73f4d0 Merge remote-tracking branch 'origin/5.10' into 5.10.0
Change-Id: I42aa9ce33260d7ea1cd51ac5ba1bf525f92d1185
2017-11-20 13:54:12 +01:00
Qt Submodule Update Bot
63bda0c988 Update submodules on '5.9.3' in qt5
Change-Id: I88eccfead04f469fe0fae41ac2a8bd8c3bbf1a3b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-19 06:57:15 +00:00
Liang Qi
35db040229 Update qtwebengine only
Change-Id: I3f5934b4787c7206391cbfaa305138df447b1d23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-19 06:55:22 +00:00
Qt Submodule Update Bot
0ec6aad455 Update submodules on '5.9' in qt5
Change-Id: I1784fb95e461ceba61f8a91a410407f43116631b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-17 10:36:31 +00:00
Liang Qi
062b29b311 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
2017-11-16 23:14:25 +01:00
Liang Qi
26fda37639 Update submodules on '5.10' in qt5
Change-Id: I92ef03c6036b4391aa9c380c1b55b9ac388a3b07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-16 08:51:10 +00:00
Qt Submodule Update Bot
ecc7d251fa Update submodules on '5.9.3' in qt5
Change-Id: Id2262d4cad8e8ee526365d221c8620a7cd3ac053
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-16 08:29:30 +00:00
Joni Jäntti
08765d9258 provisioning: RHEL7.4: Add Python3
Python3 is currently not installed in RHEL7.4 provisioning.

Change-Id: I788b7f40ab7731f50f98f15defaac13f0296b54e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-16 08:29:22 +00:00
Qt Submodule Update Bot
f0dd13f05a Update submodules on '5.9.3' in qt5
Change-Id: I887eab07a2d6d7b0314d14371c329edf1251d2a5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-15 05:17:24 +00:00
Qt Submodule Update Bot
329d718a19 Update submodules on '5.9' in qt5
Change-Id: I35e62f9e2869d95d2432e369dc69f57262925741
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-13 22:15:03 +00:00
Tony Sarajärvi
f84bab04f7 Remove unneeded provisioning scripts
Change-Id: Ie8ff5810f07528fd23044e1b1396fc4fdde58283
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-13 22:14:52 +00:00
Maurice Kalinowski
4096e387f0 OpcUA: Add Open62541 Support
Open62541 is a new backend added to the Qt OpcUA module. Furthermore,
this is going to be used as new test server to verify changes against.

Change-Id: Id08c91644f33734318925d84fb22b0d011604dd9
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2017-11-13 04:53:30 +00:00
Konstantin Tokarev
c016a01b4c Conan: fix names of ICU dll's which are added to qtwebkit binary package
Change-Id: I5e6357e8dc0e5ae44447bc13cfba8429b89934e7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:56 +00:00
Joni Jäntti
841cf6893a Make QtWebKit builds use vanilla Win 10 x64 template
QtWebKit build targets are currently using the old non-vanilla template
for Windows 10 x64.

Change-Id: I67c536bc86939508cb8056ac3b7372096274fa69
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:52 +00:00
Heikki Halmet
6309243064 Provisioning: Install expect
Expect is needed by Release Test Automation (RTA) to automate
configure testing.

Change-Id: I66889c70667a12f962cbea39906bd8b7a1d63517
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:49 +00:00
Tony Sarajärvi
d56552566f Provisioning: FBX SDK
We need to provision the FBX SDK for Qt3DStudio.

Task-number: QTQAINFRA-1449
Change-Id: I52587cd653b7954340d5f58978ffbd008330337c
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:46 +00:00
Qt Submodule Update Bot
f789a8004a Update submodules on '5.9.3' in qt5
Change-Id: I035628fed6f03353fd754ec21a293394709a0ce3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-11 14:58:32 +00:00
Heikki Halmet
a8bd91bc27 Provisioning: Remove old cmake before installing new one
Windows 10 x86 isn't yet vanilla so provisioning needs to remove old
cmake before installation

Change-Id: I2712aaa652492520d68a597d99a3c2d6bdbe2433
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 14:58:17 +00:00
Liang Qi
d0df4f2ce9 Merge remote-tracking branch 'origin/5.9' into 5.9.3
Change-Id: I2bb4b5d5b507c6586a9f9f7f2765d5f102ad180b
2017-11-11 12:57:00 +01:00
Jan Arve Sæther
3653630d22 Provisioning: Disable NTP synchronization for Windows
During CI, it has been observed that some processes didn't leave their
wait state. (So they were "hanging")
During analysis of the event log on that CI node, we found out that at the
same time those processes entered this state, the NTP client set a new time
and indeed the local time of the CI node changed (it was
changed 2 hours forward in our case).
For the record, the processes we observed this with was jom.exe and
cc1plus.exe (the latter is the g++ compiler in the mingw toolchain)).

We therefore have a strong suspicion that the NTP time change was causing
the CI hang, so we simply disable it.
The virtual machine should anyway get the correct time from its VM host
when its started.

Change-Id: I1204063399e2a4741b7b26b79858759c1bc5eab2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-11-10 23:29:49 +00:00
Liang Qi
90272a84ae Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
2017-11-09 14:05:56 +01:00
Heikki Halmet
60fb3cb272 Provisioning: Install signing tools to MacOS
Install needed certificates and signing tools which are
needed when signing release packages

Change-Id: I21b9c3d1a6b4c83dec6b8ae1674def4ecc02f444
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-09 04:23:52 +00:00
Heikki Halmet
ada909932d Provisioning: Update Java to version 8
Current version of Java isn't installing correctly during provisioning.
Silent installation needs parameters which are added to script. Without
those the installation process tries to open Java3BillDevices.jpg
unsuccessfully and the installation fails

Task-number: QTQAINFRA-1498
Task-number: QTQAINFRA-1394
Change-Id: I5672d230eb348186345887da81cdd97a4f59bce8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-09 04:23:43 +00:00
Joni Jäntti
537ea17d14 Fix Ubuntu 16.04 random provisioning fail
Ubuntu 16.04 provisioning sometimes fails in the apt-get commands for
package installations. This is caused by a lock that is still in use
when the system is calling the apt-get commands.

This change will use the apt daemon to queue the install commands
and wait for the lock to release instead of checking once and then
failing if the lock is not open.

Task-number: QTQAINFRA-1502
Change-Id: Idd4aff42f99cf4d14c08aef8fcc3cb7dbc58b2dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-08 11:50:25 +00:00
Liang Qi
207494b1d3 Update submodules on '5.9' in qt5
Change-Id: I038001efcd21e74f02786441c4a30c81d30d1336
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-08 10:00:31 +00:00
Qt Submodule Update Bot
ee4b7e638b Update submodules on '5.9.3' in qt5
Change-Id: I1ff81c92c5e273e423788b3d0fff9afcaec23549
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-11-08 05:33:39 +00:00
Qt Submodule Update Bot
b0eddcbae6 Update submodules on 'dev' in qt5
Change-Id: Iec4f8b9f7178a8d2bc0f848752db976191e14331
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-08 04:51:40 +00:00
Oswald Buddenhagen
94ce420956 Adjust submodule branches
Change-Id: Ia4636256e7797beffbbdddb21f2f6b4839e1020b
2017-11-07 16:58:57 +01:00
Heikki Halmet
0e278c4e95 Provisioning: Remove logical OR when echo errors
set -e won't work if logical OR is used after commands. These error
echo's need to be removed so that error catch will works. Also set -ex
added to print executed command when error caught.

Task-number: QTQAINFRA-1533
Change-Id: Ib4ea832a0ee813f99f59ebacad51ec57c3eff57d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-07 15:25:12 +00:00
Tony Sarajärvi
894c63834b Fix spelling of ANDROID_SDK_HOME
It was incorrectly created at ANDROID_SDK_ROOT,
but Coin doesn't use that env variable. It uses _HOME.

Change-Id: I64b8befd4341e917c7aa28586ac8bf1dbf4e23a4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-07 15:25:04 +00:00
Qt Submodule Update Bot
f1a9b684bf Update submodules on '5.10' in qt5
Change-Id: I88d2003d82ca37105d351d00c255e8f6ab303529
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-07 03:52:53 +00:00
Joni Jäntti
e3deccd936 Yocto toolchain provisioning to CI
Provisioning scripts need to install Yocto toolchains (32 and 64 bit)
so that the artifacts aren't needed to be unzipped during Qt builds.

Task-number: QTQAINFRA-1454
Change-Id: Idceeabb7aa9ffe2555fb98c94916f8429c32af75
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-06 07:56:18 +00:00
Qt Submodule Update Bot
f132490a61 Update submodules on '5.9' in qt5
Change-Id: I07353da970e5939cfba760c23b11d74d2de02a9c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-06 07:56:14 +00:00
Qt Submodule Update Bot
59ee506fe6 Update submodules on 'dev' in qt5
Change-Id: Icf103970bed93741218f7e3165ede8852672eaef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 09:14:08 +00:00
Liang Qi
0aecf8a1df Update qtwebengine only
Change-Id: Ib0480653a5afc9fbf202a5e0108a4536a1ec9f92
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 07:24:19 +00:00
Jani Heikkinen
e70e81a4aa Merge remote-tracking branch 'origin/5.9' into 5.9.3
Change-Id: If3754a87a42cc51f3a972d227056ab5eb2ef4a49
2017-11-03 14:37:24 +02:00
Jesus Fernandez
4a4589d878 Don't recommend QtWebView in QtNetworkAuth module
QtWebView is not used in QtNetworkAuth. There is no need to recommend
the QtWebView module.

Change-Id: I2dbb9d4024ada9436725f4dac643574b558fb9ae
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-11-03 11:08:25 +00:00
Heikki Halmet
6275ed9d70 Provisioning: Fix p7zip installation
Change-Id: Id6847ee203fdee03c6db067a952f9da5188d3d5c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-11-03 07:15:41 +00:00
Joni Jäntti
03d6b7b36a Fix Windows 8 libclang script locations
Currently for some reason there exist both "windows-8" and
"windows-8.1" folders in coin/provisioning/. "windows-8" folders
contain only the libclang provisioning scripts. These should be under
"windows-8.1" since "windows-8" shouldn't exist anymore.

Change-Id: I19ca70079c19cebd0482cf2d7502894648f19267
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-11-03 07:15:38 +00:00
Heikki Halmet
634d196109 Provisioning: Refresh Subscription-manager
Subscription manager needs to be refreshed so that RedHat repositories
will stay available for provisioning scripts

Change-Id: Idebc994fbefde951000570f6690c6849abfd3666
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-03 07:15:36 +00:00
Tony Sarajärvi
baa46f9590 Provisioning: fix .ci.local addresses to .intra.qt.io
Change-Id: I0ae934a65a2eaefa0bc4db9afbe3b8701dcb0906
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-03 07:15:33 +00:00
Liang Qi
d068364935 Update submodules on '5.10' in qt5
Change-Id: Icf4e56ddd72e135dff539281f1b7d81f45132986
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-03 05:14:29 +00:00
Liang Qi
037335f4bf Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I7f1af5ed2b7653f36ebbcee5eb9255b57c4ca8af
2017-11-02 10:29:13 +01:00
Heikki Halmet
5a7288d9b2 Provisioning: Refresh Subscription-manager
Subscription manager need's to be refreshed so that redhat repositories
will stay available for provisioning scripts

Change-Id: Ie93aef60cbd2bb851673b4e1cd8afb5f23b1395c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-11-02 06:35:20 +00:00
Qt Submodule Update Bot
70f20ec55e Update submodules on 'dev' in qt5
Change-Id: I62a76cb248b1c0d1ffe22e085754a31a0c721a5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-01 23:01:12 +00:00
Oswald Buddenhagen
16249a5fce Adjust submodule branches
Change-Id: I1aafb2a8b674fabaefeee711cb15d0e959849be5
2017-11-01 13:58:30 +01:00
Qt Submodule Update Bot
4b73d4a666 Update submodules on '5.9' in qt5
Change-Id: I72963749ae7d3756933c0a561f06fc90adc59dc8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-30 06:01:34 +00:00
Joni Jäntti
f90790b3ed MinGW provisioning to 64-bit from 32-bit
We are switching to 64-bit MinGW targets in 5.11 branch.

Task-number: QTQAINFRA-1432
Change-Id: Ic806e0e6400ae98351a922ed7f5a545046273ada
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-28 19:11:21 +00:00
Liang Qi
dc66b1f7e1 Update submodules on 'dev' in qt5
Change-Id: I59501a4a693f7979b129ff6f8e19d62b5da34e16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 19:11:18 +00:00
Tony Sarajärvi
583e196784 Cleanup of opengl32.dll replacement
This one isn't needed as the vanilla OS already contains
the original file.

Change-Id: I210b62d4483ea78af7b5922c46f73e3ec6d44aeb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-28 18:40:44 +00:00
Tony Sarajärvi
185eb5b414 Cleanup of provisioning scripts as tier1 images are vanilla
Change-Id: I58c5cb64075c0b60e2e8881dd32d6fad3ab98ec7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-28 18:40:41 +00:00
Qt Submodule Update Bot
81f832f0a6 Update submodules on '5.9' in qt5
Change-Id: Id803fd815a34d0adad0e3c02cb4373b78e9a9eab
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 18:40:38 +00:00
Liang Qi
59cd433253 Update qtwebengine only
Change-Id: I8ab878c59ab56004a7293f85a4014c274dd93b06
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 06:15:21 +00:00
Qt Submodule Update Bot
d18655ef5a Update submodules on '5.10' in qt5
Change-Id: I59f1102e56c9882ad9d5c89b026c33bdcf885a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-27 13:07:10 +00:00
Jani Heikkinen
72cc047726 Fix QNX platform configurations for Qt 5.9
With Qt 5.9 series we still deliver binaries for QNX 6.6 only ->
  - Add QNX 6.6 platform configurations for windows
  - Remove 'packaging' flag from QNX 7.0 builds
  - Add provisioning script to patch QNX in windows 10 as well

This change fixes the previous 5.6 merge, where this should've happened.

Change-Id: Icf080fa5614371627f8f5245675cb190ebaaf893
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-10-27 03:18:00 +00:00
Qt Submodule Update Bot
1376f16f3b Update submodules on '5.9' in qt5
Change-Id: I903ba51634aa67a83e980c125ccc7d063e12ca73
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-25 12:37:49 +00:00
Qt Submodule Update Bot
081ee56cd0 Update submodules on 'dev' in qt5
Change-Id: Ic3774c799e0fde95edd02076fe33da9accf19ee0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 16:54:49 +00:00
Qt Submodule Update Bot
1b798a59a3 Update submodules on '5.9' in qt5
Change-Id: Ica9109b0b5868ccc60043b5c861e853837bd9213
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 12:53:33 +00:00
Tony Sarajärvi
372d2bb076 Provision vanilla Windows 7 x86 and use it
Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-24 12:53:26 +00:00
Qt Submodule Update Bot
88a5b96c50 Update submodules on '5.10' in qt5
Change-Id: I50fde887007ad394e276749b1ce354008eeb8aff
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 04:59:15 +00:00
Joni Jäntti
3b7b924b31 Fix Windows 10 x64 Python with new tier 1
Current tier 1 template #9 has python and anaconda installed that came
with MSVC2017. This messes with the provisioning scripts and ultimately
builds such as pyside, even though qt5 builds go through.

Task-number: QTQAINFRA-1503
Change-Id: Id4e1303ba2524373170f1aca7b0c7e66f9f235dc
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-23 17:37:10 +00:00
Allan Sandfeld Jensen
f129af9f81 Add mozilla-nss-devel to opensuse
QtWebEngine now depends hard on NSS as the OpenSSL backend never worked
well on Linux.

Change-Id: I4ea516bcb6fafdf6efd10493750da93b1961d965
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-22 12:17:33 +00:00
Liang Qi
6cbd3faac0 Update submodules on 'dev' in qt5
Change-Id: I6854bd7c7219a6d9cf86ff3566bea966ae2771b1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-21 06:57:56 +00:00
Liang Qi
22a2a8a6b9 Update submodules on '5.10' in qt5
Change-Id: I78d5aa1f7b2ecaecf31c4458b2d489633cf7bc17
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-20 13:50:03 +00:00
Liang Qi
c41dd34de7 Update submodules on '5.10' in qt5
Change-Id: I550202469e06a974a942fbc7f207a09236f84a7d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-19 11:39:19 +00:00
Tony Sarajärvi
5f76910476 Provision ICC to openSUSE 42.3
Task-number: QTQAINFRA-1196
Change-Id: I9ae6089acf3360a8a937b1108c13a78698d91bcf
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-10-19 09:28:47 +00:00
Joni Jäntti
357202801f Make CI use a new RHEL 7.4 provisioning
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5.

This commit replaces RHEL 7.2 in desktop builds, android builds
and INTEGRITY builds.

Task-number: QTQAINFRA-1251
Task-number: QTQAINFRA-1252
Task-number: QTQAINFRA-1253
Task-number: QTQAINFRA-1267
Task-number: QTQAINFRA-1269
Change-Id: Icef19df7fb799a4008ccdc0584821c982055e339
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-19 09:28:44 +00:00
Qt Submodule Update Bot
5c7ccdbc83 Update submodules on '5.9' in qt5
Change-Id: Ic685ba43f99c41edd5727cfe4fcc823d544f2f6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-19 09:28:36 +00:00
Tony Sarajärvi
128075f744 Fix typo in echoing version to versions.txt
Change-Id: I36f9f9181fcf60774766f122e6f5526f62c8c249
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:17 +00:00
Joni Jäntti
4cdfd8e902 Make 7zip provisioning script add 7zip to path
7zip is nice to have in path for future purposes such as when
cherry-picking to other branches where we use different
extracts scripts.

Change-Id: I40b0f8568e285d85927ad30365c0ab9224e21332
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:15 +00:00
Joni Jäntti
e8fc216658 Make Extract-7zip helper function work with the new provision location
Changed the helper function for extracting 7z files so that it also
supports the new C:\Utils\sevenzip location.

Change-Id: I4f2dafc4ccac71e2cd8a3c8148df4888f800484f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-17 16:57:12 +00:00
Joni Jäntti
e09dc71d25 Make Ninja provisioning use Add-Path function
We should use this helper function now that we have it.

Change-Id: I9a522533795d4d4e63f608a0624378f066055b10
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:09 +00:00
Joni Jäntti
a26ce5e56a Make CI use a new provisioned Win 10 template
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5. This replaces the old Windows 10 template.

Task-number: QTQAINFRA-1263
Change-Id: I0f3d1072d53eb75f7405cf79139f2919eeb1f716
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-10-17 16:57:07 +00:00
Qt Submodule Update Bot
a1958e911c Update submodules on '5.9' in qt5
Change-Id: I801d03778533471c15db148fdb9d44cbc37e249f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-14 05:37:19 +00:00
Liang Qi
f63fc8ca25 Merge remote-tracking branch 'origin/5.9.2' into 5.9
Conflicts:
	.gitmodules

Change-Id: I2a20f7682f088a6ff1dd1fdb987b0bde3844d2ce
2017-10-11 10:31:05 +02:00
Qt Submodule Update Bot
388747cb1a Update submodules on '5.9' in qt5
Change-Id: Ic7ba6fa7ab6eb9cf76b07164ce93607798eaa5b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-10-11 07:51:10 +00:00
Liang Qi
ef983c6a3b Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev 2017-10-05 17:50:40 +00:00
Jędrzej Nowacki
ee8327928d Provision 32 bit libclang on all Windowses
Up to now we were always matching host architecture for
clang version to install. It is not good enough as in
some cases (all?) we build qdoc, which depends on clang,
as 32 bit app, that can not link to 64 bit clang.

Change-Id: I7b635f38821533da32d721e5e55f0067d4d0f62e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-10-05 17:50:37 +00:00
Liang Qi
1099b1ddce Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt

Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
2017-10-05 12:47:24 +02:00
Liang Qi
cdab32be23 Update submodules on 'dev' in qt5
Change-Id: I309c7e0fffbcd8b18c9bacf1587bd247687d9c95
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-05 07:12:25 +00:00
Qt Submodule Update Bot
9a096e6841 Update submodules on '5.10' in qt5
Change-Id: I2bf9e16177826276d6b6f5f8aa1a6708d62912a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-05 06:54:38 +00:00
Qt Submodule Update Bot
ae9f6019bc Update submodules on '5.10' in qt5
Change-Id: Ifedd5a9d3cce47323ff432d7237b1156f4469bdf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-04 06:36:18 +00:00
Qt Submodule Update Bot
26ba2cdc5d Update submodules on '5.9.2' in qt5
Change-Id: I8bc573e915e725e784789f0e3ddbd40add801b42
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-10-03 14:03:55 +00:00
Qt Submodule Update Bot
b37ff601f5 Update submodules on '5.9.2' in qt5
Change-Id: I17daa24ba582f0fe85097f04e48a6bc6378a1b3c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2017-10-02 18:13:31 +00:00
Qt Submodule Update Bot
cf0a8af55d Update submodules on '5.10' in qt5
Change-Id: I66c6ad9f0c47757615bf9398ccaa2889d22681fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-02 08:29:12 +00:00
Qt Submodule Update Bot
35a3ba35ef Update submodules on '5.10' in qt5
Change-Id: Ifae0935db8d9862051b605438a4f713dd7e97a34
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-10-01 09:02:32 +00:00
Tony Sarajärvi
2a650c49ee Provisioning: Fix usage of DownloadURL to throw errors
In case DownloadURL failed it's shasum check, it printed an error
and threw an exit 1. This exit 1 was never handled in the calling
scripts and went ignored. It was also not passed forward as
it was inside a try-catch statement.

Change-Id: Iae4fd6aefb75c07623ec86dc570f0a46fec659b4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-30 12:21:16 +00:00
Tony Sarajärvi
cda49ad060 Remove duplicate MinGW 5.3 provisioning
Change-Id: Ia127315ab99c902a27d24334f13e50ff23d5ddd6
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-30 12:21:01 +00:00
Tony Sarajärvi
8a93a8fe6a Provisioning: cleanup path from cmake_linux.sh
Change-Id: Iced9f0c7811b9de076aee115502de0841c1a59cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-30 12:20:39 +00:00
Qt Submodule Update Bot
7983297c8b Update submodules on '5.10' in qt5
Change-Id: I511688940a93b3e86c0d4782cf332788e390933b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-30 09:29:14 +00:00
Qt Submodule Update Bot
e9c5f633e0 Update submodules on '5.10' in qt5
Change-Id: Ic6c5ea39d6233ef0cf95f38b7ed8da5079631aef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-29 07:58:57 +00:00
Qt Submodule Update Bot
9f69da6575 Update submodules on '5.9' in qt5
Change-Id: I18b9043156b97206500c2aa7375cf80b55623044
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-29 03:12:42 +00:00
Qt Submodule Update Bot
1643c95635 Update submodules on '5.10' in qt5
Change-Id: If4c77fbc983d5ee85655efa8ec46785b5ce2584c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-28 19:02:58 +00:00
Qt Submodule Update Bot
3fe0d212a5 Update submodules on '5.9' in qt5
Change-Id: I9481fbac3934de35e731eaf4ca9e3d907b19a303
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-27 20:38:23 +00:00
Liang Qi
1cfc052b9d Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: I16388eb0c2ebaa08e7bb1255711d64647fdad3ac
2017-09-27 10:26:38 +02:00
Qt Submodule Update Bot
36d633f2fd Update submodules on '5.10' in qt5
Change-Id: I1df55eab97f42f44bf68c41bf6e2a0e5f36fe3ae
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-27 06:47:03 +00:00
Joni Jäntti
0e4d668e35 Add official URL to MinGW Windows 10 provisioning
MinGW currently uses only internal URL without backup. Added the
official URL to these scripts with SHA1 checksum verification.

Change-Id: Id9b8a1bf1110201414e9d79c9e713475118ff661
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-27 06:04:11 +00:00
Qt Submodule Update Bot
214a38f974 Update submodules on '5.10' in qt5
Change-Id: I1d4c2064ee31a8adc1a048782824b3d597ea3242
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-26 09:24:30 +00:00
Simo Fält
0b251bbdc0 Provisioning: Install Python3 development libs to OpenSUSE
Those are required to build Pyside#5.9 branch.

Change-Id: I315c72155815d8b6b0b2c5eee4d3922374262c7a
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2017-09-26 07:30:25 +00:00
Qt Submodule Update Bot
28ffb0ce8a Update submodules on '5.9' in qt5
Change-Id: I67e1530a32c84d0eb3b9bbb702922a6ae4f20362
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-26 06:06:18 +00:00
Qt Submodule Update Bot
6d20c60b75 Update submodules on '5.9.2' in qt5
Change-Id: I7d9d8fc249fc315ab67382fdb1de77daacb1e30d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-25 17:31:19 +00:00
Heikki Halmet
512f8ff0a2 Change Packaging and iOS builds to macOS 10.12
This changes swap packaging and iOS builds
from 10.10 to 10.12

Task-number: QTQAINFRA-1095
Change-Id: I681c0abc29bfeb240dd61f8a95c811d353979013
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-25 09:10:31 +00:00
Liang Qi
892b1977c5 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I623539ff0e95642bdd58fa3bbac4d1c88afbe519
2017-09-25 08:57:06 +02:00
Qt Submodule Update Bot
90ddfaf35f Update submodules on '5.10' in qt5
Change-Id: I5ef48890ad2a3c87c1dd89bc4ee35f132bd0d967
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-25 06:09:56 +00:00
Qt Submodule Update Bot
452814565e Update submodules on 'dev' in qt5
Change-Id: If80a73c6fbdd0b790df76802e85f85a05d21dc33
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-25 05:06:37 +00:00
Qt Submodule Update Bot
51c2673304 Update submodules on '5.9' in qt5
Change-Id: I35d02c6c8d6ce01d10d094302782d81713163ded
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-24 19:29:34 +00:00
Qt Submodule Update Bot
f07e18248f Update submodules on 'dev' in qt5
Change-Id: I1dbe69b48fd449b4336c994fc0b4d6b1385327e5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-23 18:32:29 +00:00
Qt Submodule Update Bot
ce1627df92 Update submodules on '5.10' in qt5
Change-Id: I60fda85bc418ae5d030608184edc242f82d12227
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-23 07:27:16 +00:00
Maurice Kalinowski
b77ab20bf0 Provisioning: Update MQTT provisioning
MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not
being evaluated. Furthermore, a previous installation might need to be
removed.

Change-Id: I9edaeb13378aa262b453f816260ade01ba414961
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-23 05:48:44 +00:00
Liang Qi
04ccf0e8db Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.

30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
2017-09-22 21:15:52 +02:00
Qt Submodule Update Bot
6c4eb77aa0 Update submodules on '5.9' in qt5
Change-Id: If34cf07aad9b4b3a539223dd37c40c799ffb7ba3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-22 12:30:54 +00:00
Liang Qi
d82fe5cacf Update submodules on '5.10' in qt5
Change-Id: If7ecb5f1d09e34878a553b287771a8eed395bfd1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-22 08:03:30 +00:00
Qt Submodule Update Bot
bfec1f8e3b Update submodules on 'dev' in qt5
Change-Id: I5aedaf510d296b0ab7707e7ddb89affebc28fdce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-22 04:23:19 +00:00
Qt Submodule Update Bot
804bfd8700 Update submodules on '5.10' in qt5
Change-Id: I6fe7831d598a724eb8796e8a8e97a4946f5d6be4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-21 12:25:08 +00:00
Oswald Buddenhagen
4cee1be86b Adjust submodule branches
Change-Id: I4cf45c3fb92fadf5724e0941789a7fa545625753
2017-09-20 12:28:58 +02:00
Qt Submodule Update Bot
5d5a6d3a87 Update submodules on '5.10' in qt5
Change-Id: Ic0421ee85440e9f08f805c6f475238bf8820da0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-20 05:45:12 +00:00
Joni Jäntti
0c66e761be provisioning: Windows 10 x64/x86 Vulkan SDK
Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64.

Task-number: QTQAINFRA-1186
Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2017-09-19 06:39:31 +00:00
Simon Hausmann
99af319684 Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10 2017-09-19 06:39:29 +00:00
Qt Submodule Update Bot
1d965fc599 Update submodules on '5.10' in qt5
Change-Id: Ic5c4e7dde129798e0799d74741c69b32c855351f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-19 04:11:22 +00:00
Simon Hausmann
356b20feed Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
2017-09-18 13:51:35 +02:00
Qt Submodule Update Bot
c4a807ca85 Update submodules on '5.10' in qt5
Change-Id: I08e75951d175003a670987e1f9ea35296bc12d16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-18 11:49:50 +00:00
Qt Submodule Update Bot
6dd41c8406 Update submodules on '5.9' in qt5
Change-Id: I46cf8a6f861952ceed6a36ae1b2cb7ca2b103fb8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-18 10:32:58 +00:00
Liang Qi
e7472f4308 Merge remote-tracking branch 'origin/5.6.3' into 5.6
Conflicts:
	.gitmodules

Change-Id: I3f5310cfb9b839e622ab606fd674a58d50515c0c
2017-09-18 09:42:25 +02:00
Qt Submodule Update Bot
f02c2e2fde Update submodules on '5.10' in qt5
Change-Id: Ia67db183b40e1bec41677876f7c8c4c4e69f30d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-17 00:00:57 +00:00
Simon Hausmann
57043fb07b Clean up QNX patching
Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches
from ci-files01 instead.

Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-16 05:35:10 +00:00
Simon Hausmann
b7d9431716 Fix python installation on OpenSuSE 42.3
The move was forgotten in commit
dd3d32d13c that merged the 42.1 to 42.3
switch from the 5.9 branch.

Change-Id: If76ac7b54187cfb29dafeaccbd3cd56e3e01deab
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-16 05:17:48 +00:00
Heikki Halmet
12fd0d5b9b Ensure 'clean' android Installation
Remove old android installation and make sure new 'clean' android
folder is created.

Change-Id: I4c561797791e08976b07a194c2c9ed2f5aa302bb
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-15 10:38:24 +00:00
Maurice Kalinowski
fd76acc661 Add mqtt to qtci-linux-openSUSE-42.3-x86_64
MQTT provisioning happened concurrently with an OpenSUSE update.

Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-14 15:04:30 +00:00
Tony Sarajärvi
b0a9259c6e Provision and build QNX660 on Win 10 x64
Changes the mingw from 4.9 to 5.3.

Task-number: QTQAINFRA-1208
Change-Id: I360b9806c35e597a4b9fd0d57c10eebfb8643905
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-14 12:08:39 +00:00
Tony Sarajärvi
2a5f54d07e provisioning: install MinGW 530 and 630 for Win10 x64
MinGW is an alternative option for Visual Studio. It's
used to create desktop builds and for cross compiling
Android and QNX. At this point it is still unclear which
version is going to be used for what, but as both are
supported, let's think ahead and provide them both.
This also allows us to debug with the other, if the
other is causing problems.

Task-number: QTQAINFRA-1289
Change-Id: I2a922669c07d49370e608c093be80481c8613dc7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-14 12:08:36 +00:00
Tony Sarajärvi
892833cda9 Provisioning: Invoke installer with Start-Process
By launching an installer with Start-Process and -Wait,
we make sure no handles are left holding on to the
installer when we try to delete it at cleanup.

Change-Id: Ic9b700ea1ce9e70089ba4cb7e91d9765ca976333
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-14 12:08:32 +00:00
Tony Sarajärvi
a9cf936a63 Provision: Move Python3 scripts from win8 to win8.1 folder
Task-number: QTAUTO-345
Task-number: QTBUG-63133
Change-Id: I739e18a7fcb1abc72092f91662e506cfffcecb0c
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-09-14 12:08:28 +00:00
Qt Submodule Update Bot
b38e4732af Update submodules on '5.6.3' in qt5
Change-Id: I44fb9a11d14313805600ffa2f55a8f465f2307bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-14 12:08:24 +00:00
Liang Qi
5141ac6418 Update submodules on 'dev' in qt5
Change-Id: I0030602560b9e47939557c8bcea9abeb8652b373
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 13:01:07 +00:00
Liang Qi
4b0e2f79c1 Update submodules on '5.9' in qt5
Change-Id: I352ed23b7e7a025b1e1730f15a5c0ecc60497c52
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 06:45:03 +00:00
Qt Submodule Update Bot
3e9b7b16c9 Update submodules on '5.10' in qt5
Change-Id: I155cd4eccb5b298f93fe36437b9db450d6e23a6d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 04:16:14 +00:00
Simon Hausmann
b1c268a8eb Build examples also on Linux with namespaces
With this change we get coverage for namespace related build breakages
in examples of Linux-only modules, such as wayland.

Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-09-12 16:20:51 +00:00
Dominik Holland
528580bbcd Install python3 on all platforms
This forward-ports commit a99d3432f7
to 5.9, which should have been done in
6bf5691ca8 but accidentally left out.
It reuses parts of commit a5f3f8ed48
that was initially cherry-picked to 5.6.

Task-number: QTAUTO-345
Task-number: QTBUG-63133
Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-12 13:59:10 +00:00
Liang Qi
b6e6882bb7 Update submodules on '5.9' in qt5
Change-Id: I9897024607ffd0e320ad56fa8ab1d9d4ceacc6c2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-11 18:46:00 +00:00
Jani Heikkinen
2ef18dac6c Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10 2017-09-10 11:16:26 +00:00
Maurice Kalinowski
a1f173fc67 Provisioning: Install paho mqtt broker
The paho broker is used for testing the Qt Mqtt module, specifically the
client classes.

Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-10 11:16:15 +00:00
Qt Submodule Update Bot
eb89f13583 Update submodules on '5.10' in qt5
Change-Id: Ic0236346284e3b30012977f634f52d8aa3851d24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-10 00:01:18 +00:00
Simo Fält
92d1bdcb43 Provisioning: Fix shasum path
Commit c48355ebb5 changed
the path of shasum, which was not intended. While the
DownloadURL.sh utility is used by rhel in addition to
macOS we can't rely on /usr/bin/shasum but we have to
use the one found from PATH.

Change-Id: I67bb37dcb72ba3d8d1f279646e44228b27137ec9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-08 04:34:41 +00:00
Qt Submodule Update Bot
fba2c6f4dd Update submodules on '5.6.3' in qt5
Change-Id: Idc2fc0d0cc1df4929c783116169f95210baa4b70
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-07 14:34:28 +00:00
Qt Submodule Update Bot
88d718d381 Update submodules on '5.6.3' in qt5
Change-Id: Ic62656a48bcee76ff38849671ca3fbad7e58fc73
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-07 03:10:26 +00:00
Simon Hausmann
dd3d32d13c Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
2017-09-06 10:19:35 +02:00
Tony Sarajärvi
8852587991 Provision openSUSE 42.3 and add to CI
Replaces 42.1 that isn't supported anymore by
openSUSE.org.

Task-number: QTQAINFRA-1257
Task-number: QTQAINFRA-1259
Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-06 06:13:06 +00:00
Qt Submodule Update Bot
bcd7f921f8 Update submodules on '5.9' in qt5
Change-Id: I96537e757b58500804180cb579d4777e6abbfc96
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-06 06:13:03 +00:00
Tony Sarajärvi
cc8a7501f3 Swap B2Qt branch to Pyro
Task-number: QTQAINFRA-1364
Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
2017-09-05 15:15:59 +00:00
Konstantin Tokarev
6dfd0c7b38 Use 64-bit host for VS2017 builds of QtWebKit
Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-09-05 13:46:17 +00:00
Simo Fält
c48355ebb5 Provisioning: Fix DownloadURL utility's shasum check
MacOS 10.10 has older shasum tool, which does not support oneliner
verification.

Change-Id: If00b846d5772aa1991960675d022249d63e7bd77
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 11:36:43 +00:00
Alex Blasche
92b8f50bfa Introduce qtopcua to top-level Qt builds
Change-Id: Iaf9e137c0ae08cc527e14a394cfaf235dfce13fe
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 07:09:06 +00:00
Frederik Gladhorn
73834c7166 Adjust submodule branches 2017-09-04 17:38:58 +02:00
Simo Fält
a3f4bf703b Provisioning: Fix helper function's mktemp in macOS 10.10
It seems that macOS 10.10 has a non standard mktemp command. It doesn't
work as expected but prints usage and exit instead.

Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-04 14:23:05 +00:00
Tony Sarajärvi
a7b1b00350 Provisioning: Hide powershell progress bar for performance
Change-Id: I74abdcc2e7d2dccf4f85cd64fe5fb4b56e54d613
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-04 12:12:17 +00:00
Joni Jäntti
dbf737a5c0 Fix Add-Path helper function and start using it in scripts
This function was broken and only added the latest addition to the
actual PATH.

Change-Id: Ida352c7b605c1b9748bb98e4f51ce68a765c3ce3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-04 12:11:17 +00:00
Akseli Salovaara
4e1f4665c5 Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host
From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries
requires Windows 64bit machine. Linking requires more RAM than
Windows 32bit can address. Change MSVC2013 & MSVC2015
integration host machines accordingly.

Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-04 07:10:14 +00:00
Qt Submodule Update Bot
44cf10382c Update submodules on '5.9' in qt5
Change-Id: I8d2a3b3c53ef50f543e69d8824e2ec95939956aa
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-02 15:13:05 +00:00
Aapo Keskimolo
42b502f7bc Add UploadConfigureExe feature
We used to solve the requirement for uploading configure.exe from
product version, but we can add this as a feature and remove the
dependency to product version.

Change-Id: If671e7193771453cd5cd41e881875c44ff0992fb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-02 11:32:38 +00:00
Frederik Gladhorn
8c8be48167 Prefer apt-get over apt in scripts
apt explicitly warns that it doesn't have a stable UI, so it shouldn't
be used in scripts. This should have no implications in practice.

Change-Id: Id0bb0d44e73b80a19f6ba4ca1aa4d92c09d10a92
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-09-02 05:48:25 +00:00
Tony Sarajärvi
8470310388 Provisioning: Add variables properly in .bashrc
If we, in a provisioning script, add $PATH to another
file, that $PATH gets expanded there and now. We need it
written as $PATH to the target file, so that it gets expanded
when the other file is run. Not at the moment of running this
provisioning script.

Change-Id: Ie2c64764f9e0a676307cb3a144162cbc35eb33fb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-02 05:48:06 +00:00
Tony Sarajärvi
d1dfb5767f Swap B2Qt branch to Morty
Task-number: QTQAINFRA-1364
Change-Id: I9b114d2cbea60928fac4aa8dec9721099b92f5f6
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-02 05:47:47 +00:00
Qt Submodule Update Bot
87df3502a7 Update submodules on '5.10' in qt5
Change-Id: Ic754baf143f879f561c4d28c8eae3c8675ef9412
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-01 19:44:43 +00:00
Tony Sarajärvi
664ce64f24 Provisioning: Add QNX 7.0 SDP in macOS 10.12
Task-number: QTQAINFRA-1190
Change-Id: I2edb16464fa320a8e3beabea32ad673f8d6d0352
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-01 19:24:15 +00:00
Tony Sarajärvi
0dbc2a3aaf Add QNX7 as a build target on macOS 10.12 hosts
Task-number: QTQAINFRA-1189
Change-Id: Ica11a1ca1dc7b306da243f719ff48dce4d03d271
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-01 19:24:04 +00:00
Tony Sarajärvi
3ca7658781 Provision vanilla Windows 8.1 x86 and use it
Replaces existing Windows 8 x86 builds with
a vanilla tier 1 image that gets all needed
software provisioned except for VS2013 that is
pre-installed.
Also modifies existing provisioning scripts
under common to support this 32bit OS.

Task-number: QTQAINFRA-1383
Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-09-01 13:02:12 +00:00
Qt Submodule Update Bot
1726ba1611 Update submodules on '5.6' in qt5
Change-Id: Idfea61ecc744f07c6212fa4f29de808103393702
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-01 08:06:00 +00:00
Joni Jäntti
05dd83c73a provisioning: windows: ICU
Fixed ICU script to actually install ICU instead of just setting the
environment variables. It is required to build qtwebkit.

Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-09-01 08:05:57 +00:00
Joni Jäntti
30660bf987 Make CI use a new provisioned Win 10 template
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5. This replaces the old Windows 10 template.

Task-number: QTQAINFRA-1263
Change-Id: Ieeb2ae3c53841644996d99ca86228df6f825a63a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2017-09-01 08:05:54 +00:00
J-P Nurmi
eb6ce241f0 qtquickcontrols2: recommend qtimageformats
The new image-based style in Qt Quick Controls 2 uses WebP for
animations.

Change-Id: I42360fc29fbfdc1d85cab5ef37b57569e5af6901
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-08-31 14:29:01 +00:00
Simon Hausmann
6bf5691ca8 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/provisioning/common/InstallPKGFromURL.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh

Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
2017-08-31 11:25:26 +02:00
Simo Fält
a99d3432f7 Install python3 on all platforms
Python3 is required in 5.6 by pyside-setup.

Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit a5f3f8ed48)
(cherry picked from commit a765838889)
(cherry picked from commit 1859f9b26c)
2017-08-30 19:57:54 +00:00
Qt Submodule Update Bot
39b3764a5a Update submodules on '5.6' in qt5
Change-Id: If6a7d9a6d34a5e25459c1c3bca1ef55f923eeeae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-30 17:17:03 +00:00
Simon Hausmann
1bd2b2acfa Fix code duplication for cmake installation on Linux
Share the code for installing cmake on Linux.

Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-30 17:16:59 +00:00
Joni Jäntti
c7a9bb92e1 Fix adding to path lines for Windows provisioning scripts
Currently the path addition command will forget the previous addition
when adding a new string. This hasn't been found out because python
was the only script using this command. Now we also need to set the
path for ruby, so the python string is left out.

Change-Id: I39721d78111550189e52a9f095030033f9660c0a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
2017-08-30 17:16:56 +00:00
Tony Sarajärvi
835ef953f0 Provisioning: Fine tune cmake provisioning script
Add version printing and move version strings to variables for
easier reuse.

Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-08-30 17:16:52 +00:00
Tony Sarajärvi
f05289d622 Provisioning: Add $PATH properly in .bashrc
If we, in a provisioning script, add $PATH to another
file, that $PATH gets expanded there and now. We need it
written as $PATH to the target file, so that it gets expanded
when the other file is run. Not at the moment of running this
provisioning script.

Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-08-30 17:16:48 +00:00
Qt Submodule Update Bot
4ad6292028 Update submodules on 'dev' in qt5
Change-Id: Id6afc51f57495e9416bdad103292a4be5503049e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-30 11:23:31 +00:00
Qt Submodule Update Bot
bf09762570 Update submodules on '5.10' in qt5
Change-Id: I10ce89cd030062845d72a49266bb077cabd935ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-08-30 04:21:28 +00:00
Qt Submodule Update Bot
21ecbe1957 Update submodules on '5.9' in qt5
Change-Id: I89cafd064580d98afb8c55c82465bc3348652ff3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-08-29 15:05:35 +00:00
Simon Hausmann
207eb4069b Fix cmake and python installation on RHEL 7.2 and OpenSuSE 42.1
The merge commit 74eb853384 accidentally
brought forward the removal of files from commit
49ccf716dc that were not supposed to
propagate.

Change-Id: Ia5d6b2205c75f0856c3fed104149980c75a55840
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-08-29 10:23:22 +00:00
Martin Smith
cf92d02d8a Provision Ubuntu 16.04 with libclang
It is needed for QDoc.

Task-number: QTBUG-62532
Change-Id: Icfc7d0af8a90cf827f4d6468e95f5aa002872102
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-29 04:32:57 +00:00
Qt Submodule Update Bot
b663966026 Update submodules on '5.9' in qt5
Change-Id: I96b67c72364dabaf6bbefbcf561104bbd01ee6b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-08-28 17:16:10 +00:00
Qt Submodule Update Bot
4bddc8d3f6 Update submodules on 'dev' in qt5
Change-Id: Ic635a1050dd225a105925bfbc006ad933f352c27
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-28 07:28:26 +00:00
Qt Submodule Update Bot
be3e818688 Update submodules on '5.9' in qt5
Change-Id: Ibf7a0094c2e06fdf7b1f62eaf90d6e4f6c6e1161
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-08-28 04:17:37 +00:00
Alex Blasche
6a44181e8c Update ldconfig cache once freeopcua has been installed
Change-Id: Id9a2fd6c0f4f426906cf5d553db9559e180b27ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-08-26 12:00:26 +00:00
Timo Aarnipuro
8007941af0 Enable INTEGRITY coin builds
Task-number: QTBUG-61702
Change-Id: If5f10aafc6d2c0853fbc3039aa7368620e04ea20
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 13:55:01 +00:00
Oswald Buddenhagen
738509c242 Adjust submodule branches
Change-Id: I24415b4ce9d74e9eb83420a55e9036d1b0785a73
2017-08-25 14:59:40 +02:00
Liang Qi
e6da4a6aa5 Update submodules on 'dev' in qt5
Change-Id: I7192cbb513f05320c792a29a598b535bcd469d85
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 11:55:17 +00:00
Simon Hausmann
3a000ed41a Fix target architecture for Boot2Qt declarative tests
Amends 7456e028a7 and therefore allows
the re-use of the boot2qt build artifacts.

Change-Id: I4b01bf13e0004c4c3c3a2be00b02760e0ad3ffdd
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 09:08:10 +00:00
Qt Submodule Update Bot
3dc3ceb646 Update submodules on '5.9' in qt5
Change-Id: Ia93843e106a111a79740fe9b5a55eb177259dcfe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-08-25 08:27:15 +00:00
Liang Qi
ebf8aa15e6 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
	coin/provisioning/common/system_updates.sh
	coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh
	coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
2017-08-24 09:12:33 +02:00
Alexandru Croitor
dfaabde5dc Enable developer mode on macOS platforms
Previously when a VM user tried to attach lldb to a process via ssh,
lldb would fail with the following error message:
"error: process exited with status -1 (unable to attach)". If this
were done over VNC rather than ssh, the user would instead get a UI
popup to enter a password to allow debugging the process.

When trying to debug an application using Xcode for the first time,
Xcode will offer to enable the so called "Developer Mode" which allows
attaching a debugger without specifying a password every time.

This change enables "Developer Mode", so that every VM user doesn't
have to.

Change-Id: Ie4e473a982c908afd456ac1773bbdaf4ce778094
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-24 04:49:06 +00:00
Qt Submodule Update Bot
f1b1f3dc09 Update submodules on '5.9' in qt5
Change-Id: I12a0463f0b91624649abe6da4cb745f6c20ed69f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-24 04:49:02 +00:00
Simo Fält
9d65cd5ca5 Provisioning: Install libclang and its dependencies to macos 10.12
Libs and llvm-config is required by pyside. In order to extract
libclang package, we need to install 7zip. 7zip is installed
with homebrew.

Change-Id: I35367dca1f79dbc9e2f1513480f6fc9bb69730d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-23 05:50:26 +00:00
Liang Qi
74eb853384 Merge remote-tracking branch 'origin/5.6' into 5.9
Move the Documentation feature to the corresponding Ubuntu 16.04, where
the CI would have used it by magic.

Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io>
Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
2017-08-22 08:22:02 +02:00
Kari Oikarinen
c2493f9d6d Use libusb compiled with MSVC 2015
QDB has to change to using Windows 10 for releases, because Windows 8.1
is no longer available for non-qt5 builds as a packaging platform in 5.9
branch.

Don't provision libusb on earlier Windows versions, since they don't
have a compatible compiler.

Change-Id: I771a24fcf208c4961483a39e51cb7d95f004ed55
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-08-21 17:49:27 +00:00
Sami Nurmenniemi
79db6fc856 Do not use font files from boot2qt toolchain
Previously font configuration files were used from the host system.
Updating the toolchain to Morty introduces Cantarell font which
causes toolchain fonts to be used by Qemu. This change forces
also the actual font files to be used from the host system
regardless of what is in the toolchain.

Task-number: QTBUG-62528
Change-Id: I00de0baa952c9b898edc6b9da8d1d8814f6c722b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-21 09:39:57 +00:00
Frederik Gladhorn
896bb94c74 Remove outdated provisioning scripts
Ubuntu 14.04 and OS X 10.8 are no longer relevant

Change-Id: Ib18dda605501fbbf2a6cac578a1b34d82102fae4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-08-19 14:51:39 +00:00
Simo Fält
629e24b979 Provisioning: Install libclang to OpenSUSE
The script will install custom package, which is known
to match with pyside requirements.

Change-Id: I28ff7877ef1bba50f8d32007af87e70c0ddc398a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2017-08-17 19:52:48 +00:00
Simo Fält
62c6676f87 Provisioning: Install pip for macOS 10.12
Pip is required to provision python packages.

Change-Id: I73ab7556bb6b9ccc57ef078f422bfbba4bfed6a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:41 +00:00
Simo Fält
3690fe06a4 Provisioning: Update CMake on osx 10.10
Pyside requires cmake 3.1.0 or more recent.

Change-Id: Ic376d5e5af9f9b0692a2de7c4ec35e6c8bfa9465
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:35 +00:00
Tony Sarajärvi
f238362a4b Provisioning: move installing Android NDK and SDK back in line
Installing the NDK and SDK takes a lot of time and finding potential
other problems require us to first download the entire Android SDK.
By moving it back in line, we first make sure the other stuff work
before taking care of this.

Change-Id: Ibae82dca247c8ae063548dbafa5a348102bf8ddb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:29 +00:00
Tony Sarajärvi
7db6a1cd0f Provisioning: Reduce verbosity of uncompressing Xcode
Change-Id: Id09ace3fcdf53c3b6921ed277c9fe571b5c43e3b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:24 +00:00
Simo Fält
c9f842af84 Provisioning: Install virtualenv for macOS 10.12
Python virtualenv command is used when building pyside modules,
which installs additional Python modules during build time
and requires access to installation directories.

Change-Id: Id34ac8b36710ba04d8db263acdaf2bd31e314de8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:18 +00:00
Kari Oikarinen
1720ed0b6f Adapt comments to qdb repository move
Change-Id: I3ecdc952d1323a14471cdc87b6854b857d4297a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-16 18:57:26 +00:00
Kari Oikarinen
890a478e07 Update libusb version
Use an unreleased version that does not have a crash on Windows 7, since
there is not yet an official release that would include the fix.

Task-number: QTBUG-62430
Change-Id: I14d83d01fe3d4b0bfebe7514fbec7d25e99af731
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-16 18:57:15 +00:00
Heikki Halmet
5df417aeb9 Provisioning: Disable system updates
This change will disable system updates from App Store to prevent
unnecessary network load

Change-Id: I7915ec6ffce681a850abef59d58f953effd6deb0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-16 06:03:50 +00:00
Qt Submodule Update Bot
15b608cbc5 Update submodules on '5.6' in qt5
Change-Id: I5e3b9c2b92ee4403054820cd6a902c9dfbac0e0f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-16 06:03:42 +00:00
Simon Hausmann
5a0dc401fa Remove QtWebKit and QtWebKit examples from Qt 5
They are subject to a separate release.

Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-08-15 19:01:35 +00:00
Qt Submodule Update Bot
d5967be094 Update submodules on '5.9' in qt5
Change-Id: Ia834fffa1951ba804dbf76af3d62652b17d947db
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-15 19:01:28 +00:00
Joni Jäntti
bd3ddeddd2 Make CI use a new win 8.1 provisioning instead of win 8
Added all the provisioning scripts that install required
programs and make changes to certain settings. These are needed to
build qt5. This replaces the old Windows 8 template.

Made all the Windows platforms use the scripts under
provisioning/common/ instead of duplicate files.

Task-number: QTQAINFRA-1357
Change-Id: Ic3f0b50079b212437fff711379f243753ab84872
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-11 16:49:10 +00:00
Tony Sarajärvi
043e54c7c6 Update provisioning scripts with new intra.qt.io address
Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-08 20:05:08 +00:00
Qt Submodule Update Bot
e4ba13a038 Update submodules on '5.6' in qt5
Change-Id: I3fc0805275d848bc4323e521ecfdf5cc06a518f4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-08 20:05:02 +00:00
Qt Submodule Update Bot
d841f90122 Update submodules on '5.6' in qt5
Change-Id: I5e7608f87019c2aed077dc85963b1c349c17824e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-06 11:47:29 +00:00
Qt Submodule Update Bot
55227444e3 Update submodules on '5.6' in qt5
Change-Id: I3da0ef78a783a692825f8bc7000d28c8b35fb7b6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-05 05:47:53 +00:00
Simon Hausmann
49ccf716dc Remove unused provisioning scripts
RHEL 7.2, Ubuntu 15.04, 16.04 and OpenSuSE 42.1 are not used in the Qt
5.6 branch. Let's remove the scripts to avoid confusion.

Change-Id: I3829ea320ad77ebd25c9cf5bebfeed89f37f44dc
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-08-04 19:22:40 +00:00
Frederik Gladhorn
d1d36cbbf1 Add Documentation feature to one Ubuntu 14.04 build
When creating packages, we build the docs on one configuration.
Previously that was done by magic inside the continuous integration
system. Make it a bit less magic by having a flag for it.

Change-Id: Iee5be7037023929b319beffaacb1592dc87d6078
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-04 16:12:56 +00:00
Harald Vistnes
830f8ac7f2 Make Qt3D depend on qtbase and optionally on qtdeclarative
This change will make the pure C++ libs of Qt3D be built even if
qtdeclarative is skipped.

Task-number: QTBUG-62256
Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2017-08-02 05:30:16 +00:00
Qt Submodule Update Bot
c60e90a2c8 Update submodules on '5.6' in qt5
Change-Id: Ic0bc89be8a9b0d3dda06f6f43bbe21e60032a65f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-08-01 04:22:00 +00:00
Tony Sarajärvi
36d7e7a8da Update Xcode to 8.3.3 in macOS 10.12
Change-Id: I990d2ac89044a5afc6170da9f5c22bc144021036
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-07-31 20:16:46 +00:00
Qt Submodule Update Bot
d18d7aaa40 Update submodules on 'dev' in qt5
Change-Id: Ic68d5b4cc41971eb619f2ba32097612aa20df3b1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-29 05:44:26 +00:00
Paolo Angelelli
74fa40d978 Replace QNX7 target with QNX6.6 for all Qt modules
Reason being that it's much easier to trigger compile errors with the
QNX6.6 toolchain than with the newer QNX7, so these show up at once
and not only at qt5.git integration.

Task-number: QTBUG-62047
Change-Id: Ib45728c92488206dbede019e4583bc9a5386b90f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-26 14:11:29 +00:00
Simon Hausmann
b229f6d1ea Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
2017-07-26 15:34:03 +02:00
Maurice Kalinowski
42a802efba Update freeopcua version
And also moved to Ubuntu 16.04 as we're not testing 14 anymore.

Change-Id: I3fd12a1ff290e564f15a557da33ce3c0008b4f81
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-26 07:45:00 +00:00
Joerg Bornemann
5958b8d3f0 Turn off line ending conversion for .commit-template
When committing a change, the automatically generated git commit message
consists of

1) The content of .commit-template
2) Informative text for the current commit, generated by git.

While 2) always has LF line endings, even on Windows, 1) might have CRLF
line endings if core.autocrlf=true. The result is a text with mixed line
endings. With the default editor vim, every line of the commit template
part ends with ^M.

Fix this by forcing the line endings of .commit-template to be LF
regardless of core.autocrlf.

Change-Id: I6db825695466d7f48f1fa4f771d83fb872fdb576
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-07-21 05:44:28 +00:00
Simon Hausmann
f56f2c20c4 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt

This also reverts c9d5341307 as on macOS
10.11 in 5.9 we're using a fresh virtual machine template that doesn't
have stale virtualenv/python installations.

Change-Id: Iab50fde0388c97967ada7c40374345ce4327613a
2017-07-19 13:24:43 +02:00
Simo Fält
c9d5341307 Provisioning: Fix virtualenv in macOS 10.11
There are multiple Python installations in our macOS 10.11 Tier1
template. Most of them are pretty old and not even working properly.
One of the affected Python tool is virtualenv, which atm is creating
Python 2.6 env by default even if Python 2.7 is the default Python.

Change-Id: I8bc0900976a9dc79637539802345175c85b7b433
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-19 05:54:01 +00:00
Jędrzej Nowacki
eca392d3f3 Use updated Ubuntu 14.04 in CI
The system packages in the base template were
updated via apt-get on 12.07.2017.

We hoped that it will solve mysterious problem of
a network interface being randomly disabled. Sadly
we had no luck, but getting all security updates
also make sense.

Change-Id: I34d7a56a2c5530376f74bb35faf461e2e18da14a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-18 16:59:07 +00:00
Jędrzej Nowacki
8b9a8c489f Use updated Ubuntu 16.04 in CI
The system packages in the base template were
updated via apt-get on 12.07.2017.

We hoped that it will solve mysterious problem of
a network interface being randomly disabled. Sadly
we had no luck, but getting all security updates
also make sense.

Change-Id: Id11eead39cf1c8a04c054c19b323f752e797fd12
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-18 11:44:27 +00:00
Liang Qi
65eb6e74f8 Update qtwebengine and qt3d only
Task-number: QTBUG-61693
Task-number: QTBUG-61983
Change-Id: I703ea440ae1b572ae97c4c6616f63b5524718931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-18 04:16:45 +00:00
Simon Hausmann
d615b4a99f Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt
		Remove QNX Windows builds, 0358b6d2
		Remove Integrity build temporarily, QTBUG-61702
	coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
2017-07-14 07:24:32 +00:00
Qt Submodule Update Bot
88cb7f4264 Update submodules on '5.6' in qt5
Change-Id: Id5ae5de68635938bc402242a3d98cb3765154d43
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-12 06:30:41 +00:00
Friedemann Kleint
1bdbe06c82 MSVC: Run tests with MSVC2017 instead of MSVC2013
It appears tests compiled with MSVC2013/64bit are prone to
crashes. Keep only a developer build/compile test in default.txt
and move the packacking builds to qt5.txt with tests disabled.
Enable testing with MSVC2017 builds in qt5.txt.

Task-number: QTBUG-58654
Task-number: QTBUG-50835
Change-Id: I6061fe3a585c4bb94100d73d04434aca42c82608
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-11 03:30:44 +00:00
Qt Submodule Update Bot
f8d8257579 Update submodules on '5.9' in qt5
Change-Id: I113ebb2db59a55786929361437a17536a0131676
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-11 03:30:38 +00:00
Qt Submodule Update Bot
70c5a5bb97 Update submodules on '5.9' in qt5
Change-Id: I3ab9f3aa74c97094076a9c385a152d1af7b6a876
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-10 05:11:16 +00:00
Konstantin Tokarev
bbf18ab4ad Add Packaging configs for VS2017 and MinGW to stand-alone QtWebKit builds
Change-Id: I6a51f733d310d8542b184e813f49f1500666d6ee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:56 +00:00
Konstantin Tokarev
dd5096c6c7 Conan: update ICU to 59.1, added VS2017 packages
MinGW packages will be upgraded in another patch.

Task-number: QTBUG-61728
Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:54 +00:00
Konstantin Tokarev
6837a847bb Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 host
Also upgrade to Conan 0.24.0.

Task-number: QTBUG-61829
Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:51 +00:00
Konstantin Tokarev
a96119c121 Provisioning: move Conan manifests to common directory
We need to use x86 packages from qtci-windows-10-x86_64 configuration,
so splitting Conan manifests by configuration is not a good idea anymore.

Task-number: QTBUG-61829
Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:48 +00:00
Simo Fält
5f37f812f9 Provision homebrew
Some of the macOS templates are cleaner than others and are mising some
basic tools like 7z. Homebrew provides easy way to install wide range of
tools via command line.

Change-Id: I5a8528bb4a13ef9a72e2467c51a8b5d45f9a3d84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-08 07:23:16 +00:00
Simo Fält
0001d102f8 Provision libclang
PySide versions following 5.6 use a C++ parser based on Clang.
The Clang library (C-bindings), version 3.9 or higher is
required for building.

Change-Id: Ia7bcad46e3214d6d8b688354c9abdc83a513573c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-08 07:23:09 +00:00
Simo Fält
577140a728 Provision 7z
macOS 10.11 tier1 template is missing 7z.

Change-Id: I9e1ade8605b5e6f389a2cd76340070070a7c637b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-08 07:23:03 +00:00
Qt Submodule Update Bot
2f03b7faac Update submodules on '5.9' in qt5
Change-Id: I15484289efb35a8b8763379466c884f32f2f9cf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-07-08 07:22:54 +00:00
Liang Qi
bded0e1bbc Update qtqa only
Change-Id: I326c5a081af3bdd5e11aff5316c604a64db94a97
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-07 22:02:45 +00:00
Liang Qi
cdbccd5a12 Update submodules on 'dev' in qt5
Change-Id: I3aca18dc902cd9499c5977e606cd256082144695
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-07 21:33:24 +00:00
Liang Qi
82bdc55bc3 Update submodules on 'dev' in qt5
Change-Id: I0c3b28b0ecfefca4211f4944a059e383173415d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-06 06:17:22 +00:00
Qt Submodule Update Bot
3c1f21253d Update submodules on '5.9' in qt5
Change-Id: I611bb70dfb5a51adfce657491820735f13aec274
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-06 05:43:30 +00:00
Qt Submodule Update Bot
7e67de9700 Update submodules on '5.6' in qt5
Change-Id: I8701d1b838be1730ccaaa2835c47e0389bb4bcc3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-06 04:16:19 +00:00
Liang Qi
e70352fdf7 Merge remote-tracking branch 'origin/5.9.1' into 5.9
Change-Id: I45fa799354b107ba95b55063f6b81f4dca4b8bb5
2017-07-04 14:18:30 +02:00
Liang Qi
cc549c2444 Update qtqa only
Change-Id: I6ef90bb4ce03188a3bcc6e22bbf1e9204e763690
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-04 11:51:53 +00:00
Qt Submodule Update Bot
2176de2286 Update submodules on '5.6' in qt5
Change-Id: I5f1e4425bf98dd9fba31f21392dfec9d991ebf7d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-04 08:02:02 +00:00
Qt Submodule Update Bot
6711742b8c Update submodules on '5.9' in qt5
Change-Id: I599d90ba87636b0e738d2263ddfd036f458ae8fe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-04 05:05:41 +00:00
Liang Qi
744634e97f Update qtwebkit only
Change-Id: I767b48af8cf41355cc984f8d884b1bc042cae4bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-03 18:04:50 +00:00
Konstantin Tokarev
331cf52ff7 Provisioning: Install Ninja on windows hosts used to build cmake-based QtWebKit
Makefile-based generators of CMake are much less efficient than Ninja. They
generate bloated Makefiles that call back to cmake often. Main offender on
Windows is cmake_depends command which seems to do lots of disk reads.

QtWebKit can now switch to ninja automatically if it's present in PATH.
This should help to reduce build times.

Change-Id: I33d3f4d766a630f8ca4fb64b719fe2e8a5c2e00c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-03 07:22:38 +00:00
Qt Submodule Update Bot
252cbbc4b8 Update submodules on '5.6' in qt5
Change-Id: I077670116fb8fa2fdce44a0260aacfedf16234c6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-30 04:53:27 +00:00
Jani Heikkinen
f3a2e06e60 Switch qtspeech & qtnetworkauth from tp to addon
qtspeech and qtnetworkauth aren't technology preview modules anymore
from Qt 5.10 ->

Task-number: QTBUG-61436
Change-Id: I1a88f554498461a81ee80f435fccad7d0e542abf
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-29 21:16:52 +00:00
Liang Qi
69188e280c Update submodules on 'dev' in qt5
Change-Id: I40a221e14a1d308619e1e382b08ae16240b81ead
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-29 21:16:49 +00:00
Qt Submodule Update Bot
477736dff0 Update submodules on '5.9' in qt5
Change-Id: Ia1e8d5681b65e37882b61f1a00f9f6acc88f81b9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-29 10:13:23 +00:00
Qt Submodule Update Bot
d07943b322 Update submodules on '5.9.1' in qt5
Change-Id: I4d1313a38b7f2296db43badf8e8906be9fa6b3d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-28 19:36:22 +00:00
Jesus Fernandez
e6d42ad390 Add qtwebglplugin
Task-number: QTBUG-61443
Change-Id: I0a139c68c41cfa11d110fab1d7c97276c4d022a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-06-28 15:34:08 +00:00
Liang Qi
b99923d6ee Update qtdeclarative only
Change-Id: Id092226dfa273fff8459b6a256ce5e5e87c364ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-26 22:27:57 +00:00
Dominik Holland
1859f9b26c Download and install vc_redist 2015 on windows 7 and 8
This is a dependency of the python3 packages for windows

Change-Id: I6f45dcb1d64f43dedd883d33fdc85038c24fc501
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-26 08:12:40 +00:00
Qt Submodule Update Bot
fd58c39c31 Update submodules on '5.6' in qt5
Change-Id: I0c2e8c0756239c679a2442c164c1eafa5b21f84e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-26 05:56:04 +00:00
Qt Submodule Update Bot
27761dc945 Update submodules on '5.9' in qt5
Change-Id: Ic665ad45eee9ee847438921bc663e9374c94a59b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-25 08:05:18 +00:00
Liang Qi
22522f5190 Update submodules on '5.9' in qt5
Change-Id: I228229c5b9afaa6e3a34ba33d7b3cbcc17695629
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-24 19:58:06 +00:00
Qt Submodule Update Bot
0f33bbfccc Update submodules on '5.9.1' in qt5
Change-Id: Iab5c3a27dbaab7804978afb0bde341155903c141
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-24 09:15:35 +00:00
Simon Hausmann
8318aa7f13 Fix builds with examples and namespaces and tests in qtbase
Manually bump declarative include a sha1 that'll unbreak the build.
Also bump qtbase to latest 5.9.1 to include the blacklisting of
tst_qudpsocket::linkLocalIPv6.

Change-Id: If5739bc170bc7f2e45d8c5e785bcad6eb15fddcd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-23 06:08:55 +00:00
Simon Hausmann
2c4b06a13d Centralize Mesa LLVMPipe installation on Windows
Install the DLL for general availability on all Windows systems. Due to
its distinct name it will not be picked up by anyone unless Qt
explicitly selects it.

This gives us the ability to choose the GLES backend to use in Qt.

Change-Id: Ie36f202ead7080a8f7690734d305bd27f0c9f56b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-06-20 04:44:49 +00:00
Oswald Buddenhagen
3dfaaaa804 Merge remote-tracking branch 'origin/5.9' into 5.9.1
Change-Id: I4cd60a86dc6538d94163702e9635a58157c599b6
2017-06-19 08:25:51 +02:00
Qt Submodule Update Bot
d4393574f3 Update submodules on '5.9' in qt5
Change-Id: Idfe407e44ed4a659615a711c34570cd99096a502
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-18 19:56:02 +00:00
Liang Qi
9781ab9119 Update submodules on '5.9' in qt5
Change-Id: If5a5489690a896422cdc183b520635675d76118b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-17 22:04:40 +00:00
Qt Submodule Update Bot
816f1c5512 Update submodules on '5.6' in qt5
Change-Id: I6c6a2f3d51f4899809810123112081a47f054358
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-17 16:39:34 +00:00
Tony Sarajärvi
0dd6023684 Remove provisioning scripts for platforms not supported anymore
Change-Id: I8c3685aaf51005f58ba84f695879f82e32a4f689
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-14 07:43:39 +00:00
Qt Submodule Update Bot
90cee99617 Update submodules on '5.9' in qt5
Change-Id: Ibea2cde30fc92cc089622379068af09e453d8504
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-14 07:42:56 +00:00
Tony Sarajärvi
52bfe2a9a8 Enable autotest for macOS 10.12
Task-number: QTQAINFRA-1093
Change-Id: I21e715b10593d0a9c55b2324c6af8e4bffca0b72
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-14 07:42:53 +00:00
Dominik Holland
a765838889 Fix the python3 packages on openSUSE 42.1
Change-Id: Ie445949ac90bf6a9ce7b519bbe3c32d2d1e1a69b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-13 16:39:12 +00:00
Simon Hausmann
20113e4872 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
2017-06-12 21:36:03 +02:00
Kai Koehne
9b0e908aca Build examples with MSVC 2015 instead of MSVC 2013
Qt WebEngine does not build with MSVC 2013 anymore, hence the examples
from this module weren't tested at all.

The 2015 configuration also places the Qt symbols in a namespace, so
this adds additional coverage.

Change-Id: I395866e8435fbcba33a1b3b4a4a5ccfe82ebad15
Task-number: QTQAINFRA-1271
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:22 +00:00
Friedemann Kleint
eb58b173e1 Enforce MinGW developer build
MinGW is very sensitive to inlining / export errors, so having a
developer build check is valuable. Add a MinGW developer build
executing tests to increase coverage and turn off testing for the
packaging build in return.

Change-Id: Ia4bdacc9952c7a568ac9d4105818eb926c88e6ca
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:13 +00:00
Qt Submodule Update Bot
967ba102f3 Update submodules on '5.9' in qt5
Change-Id: I2cfafe4529e2eb9f3c18bdc79365f0f306d42891
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:06 +00:00
Oswald Buddenhagen
9bb17a6f88 Adjust submodule branches
Change-Id: Ib2a7d9a96a8c992527db170276cd0e34b85d1dc2
2017-06-12 12:32:53 +02:00
Oliver Wolff
0787472145 Add winrtrunner to common tools on Windows 10 machines
winrtrunner is needed for running auto tests on winrt. As the tool
resides in qttools and not qtbase and it not changed often, it was
decided to handle it similar to jom and see it as an external tool.

Change-Id: I9636962df51f98bef6aad3e340c565f50e393949
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 05:43:15 +00:00
Qt Submodule Update Bot
026f813fcb Update submodules on 'dev' in qt5
Change-Id: I23fe8d00027c73dd5ea774589853a4e22c70e402
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-12 05:43:12 +00:00
Simon Hausmann
5bc43f0cc3 Fix Postgresql and Mysql environment variables
The correct paths to the headers are

    c:\utils\postgresql[x86]\pgsql\include

not

    c:\utils\postgresql[x86]\pgsql\pgsql\include

Same for libs.

Regression introduced by commit ce47238ed9
but only noticed in the 5.9 branch.

Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-12 04:43:24 +00:00
Sami Nurmenniemi
7456e028a7 Enable CI tests for Boot2Qt
Task-number: QTBUG-60261
Change-Id: I296cf7f9afc15aebf1d2006c51023cb6ac3b0c3b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-09 05:43:48 +00:00
Simon Hausmann
0358b6d28c Remove QNX Windows builds
We can't get those to work with the faster KVM based VMs, so disable
these builds for the time being.

Task-number: QTQAINFRA-1208
Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-06-07 18:10:08 +00:00
Qt Submodule Update Bot
9101ac782f Update submodules on 'dev' in qt5
Change-Id: I5f4b2743d35576c0b6df2ee62ec404d337974c3c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-07 05:06:50 +00:00
Liang Qi
9bb96b31a0 Update submodules on '5.9' in qt5
Change-Id: Ie82dec6200b3b2a9633feb2dabec9ac27afbcaf8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-07 05:05:03 +00:00
Simon Hausmann
303d617329 Disable tests on macOS 10.10
We cannot run graphical tests reliably on 10.10 anymore with the new
virtualization without vmware. As outlined in the referenced task, we
occasionally get the Window Server locking up. So for the time being,
this change disables testing on 10.10.

Task-number: QTQAINFRA-1198
Change-Id: I020d4a298562554838cd7e898df52438db536d7a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2017-06-07 04:16:32 +00:00
Simon Hausmann
35057fe4b2 Clean up windows cleanup script
* There's no need to have a numbered prefix in the common directory
* Instead of deleting directories trees worth several gigabytes of data,
  just rename the directory. The underlying storage system is
  copy-on-write and so deleting the files produces more data than just
  moving the directory out of the way. Deleting the files does not
  actually free up any physical disk space.

Change-Id: I6de02d56f3485651726ea11183ce7571d5b61520
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-06 20:15:40 +00:00
Simon Hausmann
038d263081 Speed up Windows installation of cmake, python, opengl, mysys and Android
We're better off copying off the internal server using CIFS than using
PowerShell's incredibly slow Invoke-WebRequest.

Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-06 20:15:34 +00:00
Simon Hausmann
999b5f5dd7 Speed up Visual Studio update installation
We have a prepared package on the internal server that has everything
necessary included. This way we do not have to download the actual
update content from the internet.

Change-Id: Ie4cb3116a4f91a47df5be1c2b2e473d7ddec9a78
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2017-06-06 20:15:31 +00:00
Simon Hausmann
ce47238ed9 Improve Postgresql installation on Windows
Similar to the mysql change (parent commit) it's faster to rename any
older artifacts and install only what we need. This also generalizes the
zip archive extraction code for "dev" packages.

Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-06 20:15:28 +00:00
Simon Hausmann
982659b081 Improve mysql installation
* Instead of deleting the files from a previous installation, which will
  not actually release any disk space but just make the qcow2 file
  larger, let's just rename the directory the old files are in.
  That is a significantly faster operation.
* When extracting the zip archive, only extract what we need for Qt:
  Libraries, binaries and headers. We can skip the installation of
  several thousand documentation files for example, which takes a long
  time.
* Instead of downloading the zip archive via PowerShell's
  Invoke-WebRequest we can get the data much faster using CopyItem off
  the CIFS share. As a bonus this is also more robust against download
  failures.

Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-06 20:15:09 +00:00
Tony Sarajärvi
ba1a8d6216 Provision macOS disable screensaver in current session
Task-number: QTQAINFRA-1244
Change-Id: I3a27d8cdee8cd7b22d86116d58009e952ab536ea
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-05 03:32:31 +00:00
Jani Heikkinen
5be9b3d2be Add missing ForceDebugInfo -flag for winRT x86_64 builds
Task-number: QTQAINFRA-1233
Change-Id: I5fadf9a71e5835b852849fbee1f7021864044f25
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-06-04 19:55:21 +00:00
Akseli Salovaara
8df3b0c7ea Build Windows 10 MSVC2015 x86 on Windows 10 x64 host
Changing MSVC 2015 integration host from 32 bit to 64 bit machine
enables CI for QtWebEngine 32 bit Windows builds.

Change-Id: I3d30df90fa7d92c603a2e91dd528d817e682c214
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-04 19:55:18 +00:00
Thiago Macieira
60fb73a1eb qtremoteobjects has QML plugins
Change-Id: Ia3e896da908f42939148fffd14c47ef303f5d0e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
2017-06-04 17:03:03 +00:00
Qt Submodule Update Bot
38ae7edf69 Update submodules on 'dev' in qt5
Change-Id: Ib7ce19810c0daa4c0cf39198c580dc6baa22c74a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-04 08:52:58 +00:00
Qt Submodule Update Bot
e78c03197a Update submodules on '5.6' in qt5
Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-03 21:26:37 +00:00
Qt Submodule Update Bot
eeb1a20326 Update submodules on 'dev' in qt5
Change-Id: I3a885b5f914584fa259fbd94553e8f03fb160573
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-30 05:51:44 +00:00
Qt Submodule Update Bot
c5c23f3eba Update submodules on '5.6' in qt5
Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-29 07:55:23 +00:00
Liang Qi
1f15ce005f Merge remote-tracking branch 'origin/5.9.0' into 5.9
Conflicts:
	.gitmodules

Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
2017-05-26 10:29:43 +02:00
Jason Erb
613242b2bf Add *.pro.user* to .gitignore
Task-number: QTBUG-60767
Change-Id: Id81504b35dc8d3ef7eba6ada5baaefe5e6d9f106
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
2017-05-25 21:34:29 +00:00
Oswald Buddenhagen
5236e08cd4 make -skip work with configure -redo
the handling of -skip happens outside the usual argument handling, so we
need to handle -redo manually as well.

Change-Id: I7dcdf729bd9db2ff2ac8dc08bac71462bf30814b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-25 21:34:26 +00:00
Qt Submodule Update Bot
a7dae7420d Update submodules on '5.9' in qt5
Change-Id: I2fd0c63e8b891b8595104f9f2745d62e520f340a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-25 21:34:23 +00:00
Liang Qi
cf6eb6f9ef Update submodules on '5.9' in qt5
Change-Id: I3cfe11ad0b5065f90cf57a98218af308a8906bba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-23 12:59:30 +00:00
Qt Submodule Update Bot
4d6b04db3c Update submodules on '5.9.0' in qt5
Change-Id: I4b682b41b9d42a95c9d7837a0c9d2a5cd1b16d0a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-22 20:36:56 +00:00
Qt Submodule Update Bot
d2430f9e6f Update submodules on '5.9.0' in qt5
Change-Id: I59a75557095d67dad5cf36f78fb86eb17cd05513
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-20 19:22:51 +00:00
Liang Qi
90e14cf194 Update qtlocation manually
Change-Id: Ief99f6b991ea0fbfc2c0d019b68835db36539587
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-19 15:31:00 +00:00
Qt Submodule Update Bot
9b9b3817b1 Update submodules on '5.9.0' in qt5
Change-Id: Ifc375a6978c7d8fc89396b7bfbebb18f90d59b37
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-05-19 03:48:11 +00:00
Heikki Halmet
d514585213 Enable WinRT builds for MSVC 2017
All 2017 configurations are added to qt5.txt for now.

Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-05-11 12:16:23 +00:00
Dominik Holland
a5f3f8ed48 Install python3 on all platforms
Task-number: QTAUTO-345
Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-11 10:29:12 +00:00
Liang Qi
41379a50c7 Merge remote-tracking branch 'origin/5.6' into 5.9.0
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
2017-05-08 08:35:30 +02:00
Qt Submodule Update Bot
f5754fd722 Update submodules on '5.9.0' in qt5
Change-Id: I4d592c4749ad4ddd8a54ce186ae89682a564a5ba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-07 18:36:31 +00:00
Qt Submodule Update Bot
eb362e7bc8 Update submodules on '5.9' in qt5
Change-Id: Ieb47df20d8495f0dd6f726645330dcb9542cf96d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-07 09:17:17 +00:00
Qt Submodule Update Bot
73a9754842 Update submodules on '5.9.0' in qt5
Change-Id: I3d17d880ce8a5ef4180cdbfb163df8d4f07a0398
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-06 17:32:39 +00:00
Jake Petroules
d48b0c3402 Remove Static from the tvOS configuration
This further helps with the shared library coverage on iOS-like
platforms as iOS and tvOS are nearly identical, until such time iOS can
be moved to shared libraries for official releases as well.

Change-Id: I7dbc448890759a4e49a242d4c5bcb00f6c673f4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-06 09:18:10 +00:00
Oswald Buddenhagen
8d2f6c17f9 Merge remote-tracking branch 'origin/5.9' into 5.9.0
Conflicts:
	.gitmodules

Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
2017-05-05 11:22:54 +02:00
Jake Petroules
dfb0befca3 Remove Static from the watchOS configuration
This was unintentionally added, and helps with the shared library
coverage on iOS-like platforms until such time iOS and tvOS can be moved
to shared libraries for official releases as well.

Change-Id: Iabae0503a0ce3fe538b97fc1941a1ccf19024429
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-05 06:12:36 +00:00
Tony Sarajärvi
4f4de8aa16 Change OS X 10.11 to run tests instead of 10.10
This commit removes OS X 10.10 as a developer build
target, and enables autotests on osx 10.11 developer build.

Task-number: QTQAINFRA-1090
Change-Id: I0ba0a60edd7010eedd3289c400266b4cced6c133
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-05 04:34:47 +00:00
Tony Sarajärvi
7937eb2d9e Provisioning: disable screensaver password
Previously provisioning disabled screensaver on startup
but didn't affect current session. Thus the screensaver
hits the VMs while provisioning and without this commit
the screen gets locked. This prevents the lock and
we get to the desktop on the VMs.

Change-Id: Icd783127e898ece6bebb5598ab86f12d5062eeb5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-04 17:37:00 +00:00
Tasuku Suzuki
933688fc39 Change qt3d dependency on qtimageformats to optional
only examples use webp from qtimageformats.

Change-Id: I6fb0f21800761b9ddaaf55e250cdd8926800aac7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-05-04 17:36:51 +00:00
Qt Submodule Update Bot
c1dd36f4d1 Update submodules on '5.9' in qt5
qttools manually updated to include compile fix.

Change-Id: I4cee5023ab7c33f96ff509500b1b9db53daeaee6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-04 17:36:44 +00:00
Qt Submodule Update Bot
596702c398 Update submodules on 'dev' in qt5
Change-Id: Ia5664a1fa14008265e4df4b4937d6f1de96c30c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-04 05:44:15 +00:00
Qt Submodule Update Bot
76ea20881e Update submodules on 'dev' in qt5
Change-Id: I8b9a5e7630127bc423854ec2d680a51e779b2db3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-03 10:10:56 +00:00
Heikki Halmet
a4a7f71f37 MSVC 2017 updated and missing component for winrt arm
MSVC 2017 and Build Tools updated to version 15.1. Also missing
component 'Visual C++ compilers and libraries for ARM' installed
for winrt arm

Also script added to storage msvc version numbers to versions.txt

Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-03 09:51:17 +00:00
Oswald Buddenhagen
40b07da194 make sure that all submodule urls end in .git
http(s) needs that.

Started-by: Alvaro Denis <denisacostaq@gmail.com>
Change-Id: I1373191d17586eae67bc49c3a83d1dc32b59f988
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-05-02 17:16:25 +00:00
Simon Hausmann
4ee0e8fb46 Fix tier1 template selection for QNX 7 builds on Windows
Use the latest windows 10 template, not something outdated.
Amends e3e30b4a2b with the tier1 update
from commit 070d9333a6.

Change-Id: I92bae3d971e8ad7190d883a057968a6583d34ff7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-05-02 17:16:22 +00:00
Heikki Halmet
385ecebe80 Platform Configurations for Visual Studio 2017
MSVC 2017 is pre-provisioned to tier 1 template with MSVC 2017 build
tools. When winrt arm is available for msvc 2017 in qtbase it will
be added to platform configurations also

Change-Id: Ib33cd63a974683de080bf5734081a73ecb1dabeb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-02 17:16:19 +00:00
Qt Submodule Update Bot
5af86c74b2 Update submodules on '5.9' in qt5
Change-Id: I6aed41bf25a3230d2c6643dea89033ad66543c91
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-05-02 05:09:20 +00:00
Simo Fält
e3e30b4a2b Provision toolchains and take QNX 7 SDP into use with 64 bit Win10
Task-number: QTQAINFRA-1113
Change-Id: I7151dc89c6813ad6c37fde20b8aa641578c54d4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-30 06:47:27 +00:00
Qt Submodule Update Bot
ed7ceee87d Update submodules on '5.9' in qt5
Change-Id: I3b16919a9c1e93e955fd9d5e3f3a8f699fa914a5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-29 19:47:21 +00:00
Qt Submodule Update Bot
f436db11bb Update submodules on '5.9' in qt5
Change-Id: Id118e3a91f3ac21c01823227a17075a208202bdd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-28 11:48:42 +00:00
Oswald Buddenhagen
8325f2bde9 Adjust submodule branches
Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951
2017-04-27 12:34:03 +02:00
Simo Fält
e0764f873b Provision and take QNX 7 SDP into use with RHEL 7.2
After enabling QNX 7, we are moving some QNX 6.6 config
to be ran with qt5 integration only.

Task-number: QTQAINFRA-1111
Change-Id: I230b5f8b8631558ccfa156ae4f949ed045c40972
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-27 10:25:59 +00:00
Sami Nurmenniemi
94e22fcd94 Add preparing of qemu fontconfig to Ubuntu 16.04 provisioning
If normal fontconfig paths are used, qemu parses what ever files it finds from
the toolchain sysroot and the rest from the system fonts. Fix by copying the
system font configurations to a location which prefix that can't be found from
the toolchain sysroot. Links must also be dereferenced or their targets remain
pointing to the toolchain sysroot.

Task-number: QTBUG-59966
Change-Id: I9710c9fdebe81114080f47f1f59b2a049f87c070
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-27 10:25:56 +00:00
Tony Sarajärvi
ed39e440a9 Provision environment variables for SSL autotests
Task-number: QTBUG-56102
Change-Id: I7f14fbebcc459b4610ca9469b4335ef5b18ba5b4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2017-04-27 10:25:52 +00:00
Tony Sarajärvi
fb67cd8ef0 Provision: Remove excess export that wasn't read in Ubuntus
Default shell for 'qt' user is Dash. It doesn't read .bashrc
at all. Coin uses bash, but uses it non-interactively which
in .bashrc means that it bails out immediately. So same result,
.bashrc isn't read in Ubuntus.

Change-Id: Id466c86f8cc813aacd5f41c4b267b44e93759377
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-27 10:25:49 +00:00
Miikka Heikkinen
c3d2bd97bf Add provisioning for qt3dstudio 3rdparty tools
Change-Id: I8060b6fd89e4c188d17219f43c8789aa25713068
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-27 10:25:47 +00:00
Oswald Buddenhagen
2715a17c9b get rid of custom 'qt' gitmodules property
instead, re-use the (also custom) 'project' property with the magic
value '-' to flag modules which contain no project files at all.

Change-Id: I33163c098852e1b79ad698115aac98217efe1157
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-27 04:17:42 +00:00
Qt Submodule Update Bot
c33f28bc05 Update submodules on '5.6' in qt5
Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-27 04:17:39 +00:00
Jake Petroules
ddf574fd81 Make Apple tvOS and Apple watchOS configurations available
Change-Id: I53b71d04c8cdf68f136a6ca057282c656307919e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-25 21:14:41 +00:00
Simon Hausmann
070d9333a6 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-osx-10.10-x86_64/android.sh
	coin/provisioning/qtci-osx-10.11-x86_64/android.sh

Change-Id: I2c3ae694d05ffe502967595fc7c7cfc6ddae4d4d
2017-04-25 12:37:26 +02:00
Qt Submodule Update Bot
ec5efb6b70 Update submodules on 'dev' in qt5
Change-Id: I662d698fcf213f2f5e936827dffafe0605309a31
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-25 07:14:38 +00:00
Simon Hausmann
9884a4e98e Make Java installation independent from the disks in the system
Assuming that the JDK dmg will always be mounted via /dev/disk1s1 breaks
when another disk is present in the system and the DMG ends up at disk2
for example.

Change-Id: Ia196a6ae18f455144802167c0887bf18dafbc101
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-25 04:56:11 +00:00
Simon Hausmann
2ea45a59a7 Improve Android SDK/NDK installation on macOS
* Remove unused installation on macOS 10.10 as we only build packages
  on 10.11.

* Replace the use of the ~1GB downloads of the zip files with a direct
  extraction via NFS. This is more resilient to flakyness in the network
  connection.

Change-Id: I1bfe5bbf00a6614233b517801daf130069094ec9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-24 19:19:00 +00:00
Liang Qi
69da4dda48 Update submodules on '5.9' in qt5
Change-Id: Iad79cef81aba1b694e35465aa590dac529603bc6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-24 14:48:34 +00:00
Heikki Halmet
370fdfcefd Provisioning: MSVC 2017 Build Tools
MSVC 2017 build tools are pre-provisioned to windows 10 templates

Change-Id: I98d857101ad209acd6eea9f821e367e514359d8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-24 05:17:04 +00:00
Oswald Buddenhagen
3ea073ada1 ignore submodules in dirtiness check
changed submodule sha1s should not prevent updating.

Change-Id: Ibd4480bed91de2a04719c32c95a4c603eda4c44b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2017-04-23 11:19:48 +00:00
Qt Submodule Update Bot
c6189f9723 Update submodules on '5.6' in qt5
Change-Id: Ic7e8b19d68ab1adb24604230e64e40353de11bd7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-23 11:19:46 +00:00
Liang Qi
e3b940d7e8 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I83b64c83c848a68637e2172a5201e8870c8a6a12
2017-04-21 11:40:18 +02:00
Qt Submodule Update Bot
6366979b15 Update submodules on '5.9' in qt5
Change-Id: I34ed33d4cedd7d70ac7c8adfdcfbc1ab459e9dbb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-21 06:22:22 +00:00
Simon Hausmann
ce9181a964 Improve reliability of automated xcode installation
Instead of downloading a 4+GB archive and uncompressing it in /tmp,
let's uncompress the archive via NFS and feed the data straight into
cpio. This should be faster and avoids curl's error handling that's
happy to abort instead of re-trying.

Change-Id: Ifa5d842c50111ccdbd56e795b270ee6433a63adf
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-04-21 06:22:10 +00:00
Qt Submodule Update Bot
79bc19fc8e Update submodules on 'dev' in qt5
Change-Id: I0ef28d11ce0ca7d1ba5c67c36748ebf377dc6787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-21 05:06:10 +00:00
Tony Sarajärvi
6b086604c1 Enable INTEGRITY in RHEL 7.2
Provision the INTEGRITY SDK and enable the builds
for Qt5 builds.

Task-number: QTBUG-59076
Task-number: QTBUG-59077
Change-Id: I448a16e45312b88eb5f710a600956c076480e253
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-20 05:20:54 +00:00
Tony Sarajarvi
f2467e5a48 Add java.sh provisioning script for macOS 10.12
Required by Android SDK.

Task-number: QTQAINFRA-1094
Change-Id: I4bde075f95c57fbe919ac2a5c09e25107e8525a1
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:30:06 +00:00
Tony Sarajärvi
3d27db23fd Provision OpenSSL to macOS 10.12
Change-Id: I97d811ebbdda69f78bbd5f71ae38847a851a24fe
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:57 +00:00
Tony Sarajärvi
e01ac750ac Build macOS Android builds on macOS 10.12
Removes the build targets on macOS 10.10 and 10.11.

Task-number: QTQAINFRA-1176
Change-Id: I668b74b17f48abe108673d93b6a9359dd31ce90e
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:45 +00:00
Tony Sarajärvi
9dfab7c1bd Fix provision script to create sub folders if needed
Change-Id: I6bec5e3adb66d0e88f611a83d05a52e6b8858b7a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:36 +00:00
Tony Sarajärvi
79cc848ab8 Provision Android SDK to macOS 10.12
Task-number: QTQAINFRA-1094
Change-Id: Ibee4e78979cdaff447c8a9d75024994ebc121572
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-20 03:29:23 +00:00
Qt Submodule Update Bot
f19d2c9622 Update submodules on '5.8' in qt5
Change-Id: I2dbd8467b77c1a55160396b62bf270d8cdacbb23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-19 11:25:59 +00:00
Qt Submodule Update Bot
04ab94c781 Update submodules on '5.8' in qt5
Change-Id: Ib8ef3a21c594b3c58fe8b9f51468b3e5f5b33289
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-19 10:23:39 +00:00
Tony Sarajärvi
e5f0b04f12 Update Xcode 8.3.1 to macOS 10.12
Change-Id: Ie311d7374b74ce1179f7a8bb981733be016d387f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-18 22:08:33 +00:00
Qt Submodule Update Bot
2c8fbe418c Update submodules on '5.8' in qt5
Change-Id: I4aa51db4cf07e85ed69cb82fd76dae863dd55db4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-18 06:59:49 +00:00
Simon Hausmann
8b4e259b22 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Iddf09c38c811979458639c759056a032187493de
2017-04-17 18:34:04 +00:00
Simon Hausmann
18999572b4 Update qt3d manually to pull in Ubuntu 16.04 fixes
Change-Id: Iddea4ee53f0afd5d1b2a85d190f19e82a87d61ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-17 11:47:41 +00:00
Qt Submodule Update Bot
ada6b66011 Update submodules on '5.9' in qt5
Change-Id: Ib3cb8cae3bbdedbaafe1e5deb3c0ca9252f010d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-15 06:55:38 +00:00
Qt Submodule Update Bot
c253d71a06 Update submodules on '5.6' in qt5
Change-Id: I30e320be0c03efc38d0ede024f5678e3a9c4d307
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-14 10:39:21 +00:00
Qt Submodule Update Bot
89bd3ce5a7 Update submodules on '5.8' in qt5
Change-Id: I330bfe1c5c1eda6a806feef9cc3b930362245fb5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-14 04:20:47 +00:00
Simon Hausmann
fa903eba4b Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
2017-04-13 21:54:47 +02:00
Heikki Halmet
e48d653150 Provisioning: Change tier1 templates for Windows 10
These tier 1 templates includes changes needed by 5.9, but we can use
these same tier 1 templates for 5.6 also

Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-13 12:31:58 +00:00
Qt Submodule Update Bot
bac199faa3 Update submodules on '5.9' in qt5
Change-Id: Ice64fb51928fda825b63eef8e09f752c4a67395f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-04-13 12:23:29 +00:00
Konstantin Tokarev
aac3786d67 Add cmake location to PATH when provisioning macOS 10.12
Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-12 08:55:39 +00:00
Qt Submodule Update Bot
2c7db95e7c Update submodules on '5.8' in qt5
Change-Id: I707f07be6b8f9238b4c6f9e79f1a9831e81f785d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-12 05:53:35 +00:00
Qt Submodule Update Bot
4b5af2de68 Update submodules on '5.9' in qt5
Change-Id: Id6c112e68c465ae52d49f4b35bee648894a35fef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-11 16:45:57 +00:00
Qt Submodule Update Bot
b0e96ff58f Update submodules on '5.8' in qt5
Change-Id: I6b50e79e45b05ff3a2dc5590a87eeb593b9fa2dc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-11 05:04:18 +00:00
Tony Sarajärvi
b8211774d9 Fix provision help script DownloadURL.sh
The script neglected the result of the sha1 after download.
Even with a failure it exited nicely.

Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-04-10 17:27:24 +00:00
Qt Submodule Update Bot
d353476112 Update submodules on '5.9' in qt5
Change-Id: I9c5567a7b76101548b690dee3bba06fcdf11bd36
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-10 11:54:11 +00:00
Tony Sarajärvi
bb5139dd09 Enable autotests for Ubuntu 16.04 and swap configs
As autotests pass, we can also move all existing
Ubuntu 14.04 configurations to run on a more recent
Ubuntu 16.04.

Task-number: QTQAINFRA-1101
Change-Id: I99c4f674dc48521c66ac579c6bb1b5396c282131
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-04-10 05:20:10 +00:00
Liang Qi
415ea08693 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I88192479624510cb34227f401d9e8b07977f9711
2017-04-09 09:40:45 +02:00
Qt Submodule Update Bot
5e30cba1fd Update submodules on 'dev' in qt5
Change-Id: Ie2ddd1a461354278d4570e0dc98dcf4d339183d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-08 20:07:26 +00:00
Liang Qi
b80fa7bc4c Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	.gitmodules
	qt.pro

Commit ed8f84f149 (webengine needs tools)
together with commit 5656b4848e (webkit
needs webengine) creates a circular dependency with qttools also
depending on webkit. So this commit breaks it by swapping the
serialization order between webkit and webengine.

Change-Id: I36309908adb754072495e02785ad158f8b389548
2017-04-08 19:51:16 +00:00
Qt Submodule Update Bot
703e71840e Update submodules on 'dev' in qt5
Change-Id: Id5c90ac07c171d06f5d4bc06021cbfedad77a5b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-08 14:06:40 +00:00
Liang Qi
6720096ee0 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I908f38bd8cfcfd481f005a2588df5d3440eac9c5
2017-04-08 16:04:53 +02:00
Konstantin Tokarev
0c7c11ca56 Fix AltUrl of cmake for macOS provisioning
Change-Id: I730a65c2fcbea14bd3fe44e01a182f095d96b0ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-07 22:04:06 +00:00
Qt Submodule Update Bot
c0a148bb7d Update submodules on 'dev' in qt5
Change-Id: I82c6dff79747702f65c17b094f2decad3f471cc6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-07 13:06:53 +00:00
Oswald Buddenhagen
5656b4848e serialize build of qtwebkit and qtwebengine
linking both at the same time requires more than my 16GB of RAM, so
introduce a .gitmodules field which serializes the two.
in practice, it is just interpreted as an optional dependency. the CI
system won't be taught about it, so this will not cause an unnecessary
serialization there.

Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-06 21:56:25 +00:00
Qt Submodule Update Bot
b91aca3ab8 Update submodules on '5.9' in qt5
Change-Id: I2ffc93d7195ab1d368a8dec8219be46acf1f74ee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-06 17:39:47 +00:00
Simon Hausmann
c675a237f1 Remove special configuration for xmlpatterns
Commit 8b13ccf0238aecfe2a01e3a2e6d90620a8b9e516 in coin attempted to
incrementally add OpenSuSE 42.1 support module by module, and various
transitions have lead to this file. Meanwhile commit
aa7531ca7d0e8f92c49a54f11460ece647ef73f1 in coin replaced OpenSuSE 13.01
globally with 42.1 for all modules, so this separate treatment is not
needed anymore.

Change-Id: I0e162a64816f7925a5afd5a79614a1e8843d9b7e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-04-06 14:35:20 +00:00
Oswald Buddenhagen
315b76dc9b fix url normalization
after 8c0390143, we cannot rely on the denormalized segment starting
with a slash any more.

Task-number: QTBUG-59753
Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Valentin Fokin <fokinv@inf.u-szeged.hu>
2017-04-06 09:20:33 +00:00
Qt Submodule Update Bot
e7fc74d781 Update submodules on '5.6' in qt5
Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-06 09:20:29 +00:00
Qt Submodule Update Bot
04ec42b9e1 Update submodules on '5.8' in qt5
Change-Id: I39b5d0e9bddc2f5519cb08ac0b7b538a49a550b4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-06 09:20:26 +00:00
Simon Hausmann
30da853b97 Enable QEMU based ARM testing for qtdeclarative with Boot2Qt
The module has been changed to run a sub-set of tests. With that in
place we can enable test execution, providing us with some CI test
coverage for the ARM JIT, for example.

Change-Id: I5b0ad68fcd4fa8fb73f59432b42ccdd9a5b6fd59
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-04-05 09:34:04 +00:00
Qt Submodule Update Bot
c55903eaa6 Update submodules on '5.9' in qt5
Change-Id: I549dc236009aadd78fb163a2a26b2384bb7de9ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-05 05:27:25 +00:00
Sami Nurmenniemi
e3d84a49c0 Remove fonts-noto-cjk on Ubuntu-16.04-x86_64 provision image
First test using QFont fails if fonts-noto-cjk is installed. This
happens because running fontcache for that font takes > 5 mins when
run on QEMU. Running fc-cache doesn't help since host version creates
cache for a wrong architecture and running armv7 fc-cache segfaults
on QEMU.

Change-Id: I6667b29ad4c4cae8d242e3af63defb603a6e6ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-04-04 05:06:46 +00:00
Liang Qi
285ee106e7 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.

Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
2017-04-03 12:06:27 +00:00
Qt Submodule Update Bot
25113b3315 Update submodules on 'dev' in qt5
Change-Id: If1a1dc0efcd16aa0887622800394d45d11f120cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-02 06:13:28 +00:00
Qt Submodule Update Bot
df3c9ce7da Update submodules on '5.8' in qt5
Change-Id: I9444728a1fa2c23e65a3f809767509a0854f1e2d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-02 05:13:29 +00:00
Qt Submodule Update Bot
1bb9546b48 Update submodules on '5.8' in qt5
Change-Id: I551f0a875c9c16acbcd768994051e85d9fcde47c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-01 20:23:34 +00:00
Qt Submodule Update Bot
742737bd7c Update submodules on '5.6' in qt5
Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-01 20:20:30 +00:00
Liang Qi
95223c7466 Update qtserialbus manually
Change-Id: Ic4e1200a5d75e0c7b33fcb43efb27706260e3202
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-01 07:28:35 +00:00
Qt Submodule Update Bot
30e0f087d4 Update submodules on '5.9' in qt5
Change-Id: I64a699afde6c7444abfad5d0cac19f2d1d332f7f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-04-01 06:39:12 +00:00
Heikki Halmet
e00cb3ac59 Provisioning: Bug fix patch for msvc 2015 update 3
This bug fix patch is needed for QtWebEngine

Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-03-31 06:42:09 +00:00
Qt Submodule Update Bot
ddc800b37f Update submodules on 'dev' in qt5
Change-Id: Ic47ce220597dda941335d6e0ea5dab224c900af3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-31 06:37:34 +00:00
Simo Fält
8b59bbc2a4 Coin provisioning: Use arg instead of autodetecting architecture
When provisioning windows machine, it seems that detecting architecture
by checking [System.Environment]::Is64BitProcess doesn't work properly.
Instead pass 32 or 64 as an argument when calling powershell script.

Change-Id: I890ad141b8ef194275848d0e656431753463cd2b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-03-30 15:14:04 +00:00
Liang Qi
990625d8cb Update submodules on '5.9' in qt5
Change-Id: I7dfea76bca9df8ab4db1be65068ffa46b414ad3d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-30 05:43:35 +00:00
Liang Qi
37e3da674c Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I370742cb0aa2b362dded7131adb08bc7af44a02b
2017-03-28 10:20:15 +02:00
Liang Qi
bee0c1b12f Update submodules on '5.9' in qt5
Change-Id: Iefd15fd52d2300981820cb1b067f512228100503
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-28 04:45:10 +00:00
Liang Qi
1da7bdd25e Update submodules on 'dev' in qt5
Change-Id: I5df7b6ba38a1e641aa8d154d8184a12cbd2f85bd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-23 20:50:56 +00:00
Liang Qi
0b1af0bb2f Update submodules on '5.8' in qt5
Change-Id: Icc31f52cf5a77a4100dfd63acd32e1596ead3dad
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-23 11:33:56 +00:00
Liang Qi
8889075b0d Update submodules on 'dev' in qt5
Change-Id: I9ef55bdca766e92281b92011b63ba9781f4db53f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-22 15:30:04 +00:00
Heikki Halmet
80b739b1e8 Provisioning: Move Visual Studio installation to pre-provisioning
Visual Studios will be pre-provisioned to tier1/vanilla os when visual
studio update is needed. Even if using pre-configured offline
installer with specific workload and components the installation is
still taking too long. This way we'll reduce provisioning time
significantly

Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-03-22 09:31:06 +00:00
Liang Qi
a2cd0b3102 Update submodules on '5.6' in qt5
Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-20 08:05:40 +00:00
Liang Qi
6d8560c63f Update submodules on '5.9' in qt5
Change-Id: Id9f9836551a35fba5ccd12be449f9c4a92acf486
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-19 18:46:59 +00:00
Liang Qi
6995b1e85d Update submodules on '5.8' in qt5
Change-Id: Ibf0175771f357c30243b5d309cfb4facc4a6b31b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-19 13:13:06 +00:00
Liang Qi
e193001bca Update submodules on '5.9' in qt5
Change-Id: I210324952a0126cd656344eebee2dbd6a32f6dc1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-18 06:43:06 +00:00
Jason Erb
084d79e8b4 Reflect current URL in example comment
Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2017-03-16 12:01:37 +00:00
Liang Qi
ce96014426 Update submodules on '5.6' in qt5
Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-16 12:01:34 +00:00
Liang Qi
e9d91a3949 Update submodules on 'dev' in qt5
Change-Id: Ie422699479ce2da8c94cde3987a4685348aa7a21
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-16 06:20:31 +00:00
Allan Sandfeld Jensen
3e35991013 Install g++-multilib on Ubuntu 16.04 platforms
This is needed to cross-build to 32bit x86 which WebEngine needs for
Boot2Qt ARM builds.

Task-number: QTBUG-59504
Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-16 06:20:01 +00:00
Tony Sarajärvi
b14198730d Remove command line tools from macOS 10.11 and 10.12
Qt should not require command line tools to be installed.
When they are installed, we can accidentally rely on
on the tools instead of sysroot.

Task-number: QTBUG-58325
Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-15 13:21:40 +00:00
Liang Qi
e7c6dcdb32 Update submodules on '5.8' in qt5
Change-Id: Iac3e9b6581b2bb490c8c58ccf50cd4f14b6651a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-15 06:46:50 +00:00
Paolo Angelelli
88e87fe7d3 Recommend qtquickcontrols2 for qtlocation
The MapViewer example now uses qtquickcontrols2 sliders.
This patch adds the related dependency

Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2017-03-14 07:03:14 +00:00
Kari Oikarinen
b037d8f7b1 Provision libusb for 64-bit Windows 8 and 10 as well
Amends 380fca84a9fe583e245355f2e36931473665cf0b.

Change-Id: Ia6e1a3bf2465770f55201cd723b329af42984d2b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-03-14 07:03:11 +00:00
Jason Erb
8c0390143b Remove init-repository assumption of repo url “…/qt/<repo>”
Task-number: QTBUG-59355
Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2017-03-13 15:18:47 +00:00
Qt Submodule Update Bot
f7694572d8 Update submodules on '5.9' in qt5
Change-Id: Id6e972d67243340551b0cae64619428a8f601f4c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-13 08:56:08 +00:00
Simon Hausmann
2d59a20361 Fix network test server setup
Use the correct IP address for the network test server that all the
other machines are using as well.

Change-Id: I1ffe4b6f5851bcb06dc2d39265979b799715ec3f
Task-number: QTBUG-59241
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-03-10 06:10:43 +00:00
Liang Qi
ec763635fa Update submodules on '5.9' in qt5
Change-Id: Id75b75b5dff01db70f87c0f72648bd158e6465dd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-10 06:10:40 +00:00
Liang Qi
1269f1bc8a Update submodules on '5.8' in qt5
Change-Id: Ic13d3040b541a4b4e9a293885ce49b0b9ba64afa
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-08 20:52:45 +00:00
Joerg Bornemann
a5330bb632 Add ForceDebugInfo to MSVC platforms
Create release debug information for MSVC configurations for which we
build packages.

Also, for hard-to-reproduce autotest crashes in the CI enabling
ForceDebugInfo is crucial to get a meaningful backtrace.

Task-number: QTBUG-3934
Change-Id: Ie4ea7b9c6aa251a12796621817d8e3411bbed81d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-07 21:29:30 +00:00
Liang Qi
87a4180718 Update submodules on '5.9' in qt5
Change-Id: Idad0e50dd673356a7ed27d7c7c978ba10229b71a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-07 21:19:31 +00:00
Liang Qi
f65308d371 Merge remote-tracking branch 'origin/5.9' into dev
This change also integrated latest dev branch of qtremoteobjects
and qtwebengine.

Conflicts:
	.gitmodules
	qtremoteobjects
        qtwebengine

Change-Id: Ic6f97f43c55bdca5d8ac0481f3bb8a73429657b9
2017-03-07 19:40:36 +01:00
Liang Qi
ad3c519525 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I415772838a8434d00ad4ccebc8b1c4180e85880b
2017-03-04 22:21:23 +01:00
Teemu Holappa
111799abf1 Add qemu user mode binary
qemu is used to run unit tests for arm binaries in coin.

Change-Id: I8610b5d7603fa3bcd5cf0f9e83ee38e219b60a85
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-03 14:37:46 +00:00
Akseli Salovaara
8de4f42cb6 Provisioning: Upgrade conan version from 0.16.0 to 0.20.2
Conan provisioning fails on private Coin instance due to error message
Could not find a version that satisfies the requirement conan==0.16.0
(from versions: 0.15.0, 0.16.1, 0.17.2, 0.18.1, 0.19.3, 0.20.0, 0.20.1,
0.20.2)
No matching distribution found for conan==0.16.0

Upgrading to 0.16.1 resulted warning
"Your conan's client version is deprecated
for the current remote (v0.20.2). Upgrade conan client."
and provisioning failed with "ERROR: All remotes failed"

After upgrade to 0.20.2 conan provisioning script is working again.

Change-Id: I2fe9d65460954c929abb4822d206dde42909d5b3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-03-03 12:26:24 +00:00
Liang Qi
93b18e36e4 Update submodules on '5.9' in qt5
Change-Id: I525727ffd60aabf0f8e964377f6a670f26a49338
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-02 22:01:24 +00:00
Liang Qi
82cea36531 Update submodules on 'dev' in qt5
Change-Id: Ia4717e7b16c135827c15e03bb8581d2a2f196547
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 19:53:58 +00:00
Allan Sandfeld Jensen
5f598f67f3 Add libxss-dev needed by QtWebEngine
Change-Id: Iac7e6b730803865d00b17d53e6aa488e80123b5b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-03-01 16:34:16 +00:00
Liang Qi
df0092448a Update submodules on '5.9' in qt5
Change-Id: Ia56d37f29ee715654aaeae85274073d74aedd0e8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 12:08:29 +00:00
Liang Qi
92cec830f0 Update submodules on 'dev' in qt5
Change-Id: I789836bf447b14fe223489acea9fcb898d8a35aa
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-03-01 05:22:15 +00:00
Teemu Holappa
85f6859c3d Change Boot2Qt to use Ubuntu 16.04
Changed Boot2Qt CI host from Ubuntu 14.04 to 16.04.
There is also changed the target architecture to x86_64.
Even though the meta-boot2qt builds binaries to the armv7 tests
are run in host machine using Qemu thus we spoof Coin to believe
we are running native binaries.

Change-Id: I633d01b80ec8ae753badf495ec8faa90b4659c11
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-28 19:37:43 +00:00
Liang Qi
b94b02b9a0 Update submodules on '5.9' in qt5
Exclude qtbase this time.

Change-Id: Ib294e795f7c822f3bc8a66643880cf09994d09ac
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-28 09:36:11 +00:00
Heikki Halmet
460cfd01b3 Provision: Storage icu version to versions.txt
~/versions.txt will be used to storage sw version information

Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-28 07:23:53 +00:00
Liang Qi
0fdc536920 Update submodules on '5.8' in qt5
Change-Id: Icdce897429db6ec02938807bc2add8ae8d9a1ccc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-27 04:01:39 +00:00
Liang Qi
3fa98fcbb5 Update submodules on '5.6' in qt5
Change-Id: I6676715446aa572b96f4abe7d3d8932817bfaed1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-25 07:39:57 +00:00
Svintsov Dmitry
6c6169f292 Make top-level configure script more portable
Remove hard-coded path to pwd; there is no need to have it, and for example
NixOS doesn't actually have it at this location, leading to such an error:

    ./configure: line 36: /bin/pwd: No such file or directory
    /qtbase/configure not found. Did you forget to run "init-repository"?

Change-Id: If3372db3390ba5f39c5003d12ff2a466f39ff353
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-24 12:19:39 +00:00
Liang Qi
b5e631ad6f Update submodules on '5.8' in qt5
Change-Id: Id5ddefcb8bb28109f75b181e5db41ad98519ffc6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-24 06:25:51 +00:00
Liang Qi
161f9ef9a5 Update qtbase manually
Change-Id: I5ccb9dbba46e97d213bfbb3a69393b7beed54665
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-24 06:25:33 +00:00
Oswald Buddenhagen
ed8f84f149 declare optional dependency of qtwebengine on qttools
starting with 5.7, it optionally comes with a qt designer plugin.

Change-Id: Idcc81b2688a1c09d3273b07a1ec991b54903e94c
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2017-02-23 09:48:32 +00:00
Liang Qi
e0416f4966 Update submodules on '5.8' in qt5
Change-Id: I81b3b50b87402c49a306d381c2d107fc6d4d91da
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-23 09:48:32 +00:00
Jani Heikkinen
9d03dae052 Update submodules on '5.9' in qt5
There seems to be some issue with updating all submodules so update
qtbase and qtdeclarative only to get INTEGRITY compile

Change-Id: I079837a75f20e649f26b4b55d66e65edf0ba33a5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-22 04:05:40 +00:00
Liang Qi
2df983757a Update submodules on '5.8' in qt5
Change-Id: I2a905ff8300b2f64537446ee763202eeed216c6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-19 15:44:06 +00:00
Liang Qi
848c4ac3f8 Merge remote-tracking branch 'origin/5.6' into 5.8
Change-Id: I0203dea8e441e58400d6c44697588a44b97a522b
2017-02-17 15:22:56 +01:00
Liang Qi
7470f97c4e Update qtwebengine manually again
Change-Id: I6fabfa3a4ce0b0fbcb1da2e15bdf5f8f6ac6e643
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-17 12:16:32 +00:00
Liang Qi
3fb0afb7f9 Update qtwebengine manually
Change-Id: I86dc97895dbbbff1a14e90d0a7c2ae359ce25891
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-16 15:00:58 +00:00
Tony Sarajärvi
628639ea0d Add macOS 10.12 as a build target with tests disabled
Task-number: QTQAINFRA-1092
Change-Id: I0098a1ad9df115f911a401ba06a443a30374135b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:20 +00:00
Tony Sarajärvi
00635a672a Provision: Set bash_profile to read .bashrc in macOS 10.12
The method (vmware tools) of launching a process inside a virtual
machine results in the launch of a process that does not originate
from a login shell. Therefore the CI system explicitly starts the
agent with "bash -l -c" to enforce the invocation as login shell
and thus execute settings from /etc/profile, ~/.bash_profile, etc.

This brings the behavior of the system closer to what we see as
developers.

However the shell is a non-interactive shell, therefore ~/.bashrc
is not read by default.

On Linux systems such as RHEL, ~/.bash_profile is configured to still
read ~/.bashrc.

For consistency we apply the same logic to the macOS configurations.

Task-number: QTQAINFRA-1091
Change-Id: I72206dbd8f7289de86830db23fa1ae2c548181eb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:14 +00:00
Tony Sarajarvi
c4a5844e25 Add MySQL provisioning script for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: Id20e5398007284ddf809f2c2c49a60711729db26
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:10 +00:00
Tony Sarajarvi
a8348c9e6c Add postgresql.sh provisioning script for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: Idf314816d4986855b0b4d92a5f523ec1397f4083
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:06 +00:00
Tony Sarajarvi
430aa0192d Add cmake.sh to provisioning for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I3d58c7e94866754adb22975b874ebe4a0e239ec1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:44:03 +00:00
Tony Sarajarvi
1dbe2c1ff4 Add command line tool provisioning for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I2b209c8ca59af5bfdcc1faa46ac771a85eeb457e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:59 +00:00
Tony Sarajarvi
c3fa9ffd76 Add xcode.sh provisioning script for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I6d2071c3304cc8df31d8bbad6d713d21ea2dda25
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:56 +00:00
Tony Sarajarvi
884d198a34 Add xz.sh provisioning script for macOS 10.12
Task-number: QTQAINFRA-1091
Change-Id: I5594ae5591ad0b092ed000da8930972475163f51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:51 +00:00
Tony Sarajärvi
a56c7ef768 macOS 10.12: Switch crash reporting to server mode
Task-number: QTQAINFRA-1091
Change-Id: I49c2f92f570a648e80ac16180bdf0c7967ed1120
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:47 +00:00
Tony Sarajarvi
8254e8659f Add system setup provisioning script for macOS 10.12
Task-numer: QTQAINFRA-1091
Change-Id: I0da0e22dd859609fa107b9c157a678a4e2d252e4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-15 18:43:43 +00:00
Jake Petroules
a5ba58e8dd Remove QT_SKIP_MODULES declaration
These exclusions belong in the individual modules.

Change-Id: Iaa868bf953f7bc3d72b6508272a18798a8569f4d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-15 18:02:33 +00:00
Liang Qi
e8231a46f2 Update submodules on '5.8' in qt5
Change-Id: Idb3b5cdd408d20582f10372a0e42e6f63e7a94bc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-15 07:39:20 +00:00
Liang Qi
9e092f8cad Update submodules on '5.9' in qt5
Change-Id: I631be2f14aa948c1c7678f7a1e0f2fd073a27ce5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-14 20:56:59 +00:00
Tony Sarajärvi
58ad2e46f3 Add system setup provisioning script for Ubuntu 16.04
Task-number: QTQAINFRA-1099
Change-Id: I4ea578b65aca8511641a61461fd1295a3723fdab
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-13 14:27:28 +00:00
Tony Sarajärvi
d6beaa6f27 Add APT package provisioning to Ubuntu 16.04
Task-number: QTQAINFRA-1099
Change-Id: Ie884846a21c3962aeeb83762113475f9eaf2f20d
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-13 14:27:25 +00:00
Tony Sarajärvi
e5a1280ff0 Add Ubuntu 16.04 as a build target
As autotests pass, a subsequent commit will make
Ubuntu 16.04 replace Ubuntu 14.04 build targets.

Task-number: QTQAINFRA-1100
Change-Id: Ief659eec39f40873681ba617c37acf3662551fc1
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-13 14:27:22 +00:00
Liang Qi
d4e3b5f48d Update qtlocation manually
Task-number: QTBUG-58807
Change-Id: Ia06d2a40c18d60e4665f0f7659ffd860a9deecf9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-13 14:27:19 +00:00
Joerg Bornemann
ef0e6e1e8f Add ForceDebugInfo to RHEL-6.6-x86_64
On this particular platform we get hard-to-reproduce autotest crashes in
the CI. Enable ForceDebugInfo to get a meaningful backtrace.

Change-Id: Ic9ca50394ad5708c3de4d26eb87d4c2a9d580b18
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-02-13 12:33:28 +00:00
Liang Qi
36bedf10de Update submodules on '5.8' in qt5
Change-Id: If01fe1a84460b65322bfe9d8c402f24d44e98094
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-12 06:57:40 +00:00
Liang Qi
cb78b8cfca Update submodules on '5.6' in qt5
Change-Id: I2b0758eeb79aedf3450e857fc3e29de6d3659d47
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-11 19:56:57 +00:00
Liang Qi
79b410a77f Update submodules on '5.9' in qt5
Change-Id: I04eca9ec2a5c278d53c83f5b73a7e154d33115a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-11 07:56:16 +00:00
Qt Submodule Update Bot
7fdf860fc5 Update submodules on '5.9' in qt5
Change-Id: I7c87e4fcd54dbaaa28dc6de510bcb6631fc14208
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-02-10 16:11:18 +00:00
Akseli Salovaara
880e750629 Provisioning: Update opengl32.dll x86 on Windows 10 x64
OpenGL32 update is needed for autotests to pass.
At least tst_qglbuffer vertexBuffer will fail without an update.
This update is already in place on Windows x86 and x64 CI hosts but
applied only to System32 -folders.

Change-Id: I223ffc53ecba77030385f29463c419acdc12e1a3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-10 06:14:13 +00:00
Akseli Salovaara
f1f9b94b00 Provisioning: Install postgresql x86 and x64 libraries to Windows 10
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: Ied654efb2f33ab1c643f38a1ea50a127aeb7af7e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-10 06:14:10 +00:00
Akseli Salovaara
fb7581847e Provisioning: Install OpenSSL x86 and x64 libraries to Windows 10 x64
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: Idada7fc41202298c6f1b2919f0f4343b717e890a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-10 06:14:08 +00:00
Akseli Salovaara
da4c2e21b1 Provisioning: Install MySQL x86 and x64 libraries to Windows10 x64
Install both x86 and x64 libraries in order to enable Windows x86
builds on Windows x64 hosts. Environment variables are used by Coin.

Change-Id: I8eea51a0bfd05bc72d1d004649211c7bc5901d97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-10 06:14:06 +00:00
Brett Stottlemyer
dc4ec9c5d9 Add qtremoteobjects
Change-Id: Ie7e673d95b4930a93fc6d1a4aa86241061001bc2
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-10 00:17:37 +00:00
Jani Heikkinen
6c76752673 Change qtgamepad status from preview to addon
qtgamepad will be officially supported with Qt 5.9

Change-Id: I3f941189881f2ab32ef10d4fff242e0d075798f3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-10 00:17:33 +00:00
Liang Qi
de553b356b Update submodules on '5.9' in qt5
Change-Id: Id4973a02255df2d2b311ac9f3b60d545bac3128f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-09 18:23:52 +00:00
Tony Sarajärvi
e4769f9379 Add one OS X 10.11 configuration to the CI
The "-3" suffix for the configuration name is
due to it being a clean TIER1 image and has
not everything preinstalled manually.
Tests are disabled at first. They will be enabled
once we sort out all failing autotests.

Task-number: QTQAINFRA-1088
Change-Id: I7adc05869524acdff9ba295d604c3fc28a7aab99
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-09 08:36:22 +00:00
Tony Sarajärvi
9c80884735 Provisioning: remove extra crashreport script
We have a duplicate of the same file, but different name.

Change-Id: Iedd70498a91bde0dddb05c33972fd21274399ae8
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:20 +00:00
Tony Sarajärvi
ae5c1d4f5d Provisioning: remove Android provisioning script
Android tools and NDK is not needed in 10.11.

Task-number: QTQAINFRA-1087
Change-Id: I8f3f4e71492ea09828823f6ef70ab29faa08934c
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:17 +00:00
Tony Sarajärvi
8f9d75f18f Add command line tools provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: I51aa4ee850d8e8603fac78572942e3be8f1175e4
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-09 08:36:15 +00:00
Tony Sarajärvi
0b3c843fb2 Add MySQL provisioning script to OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: If10ba5d5d3f2b4891098ffad8519fe4e16d8c268
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:13 +00:00
Tony Sarajärvi
fc32c9bbf7 Add postgresql provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: Ia186b8df007384f7fd03139ad448563b920ee21b
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:10 +00:00
Tony Sarajärvi
13ed034dc3 Add Cmake provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: If598b4b8391e13ed0891d8a65f752492fe303d29
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:08 +00:00
Tony Sarajärvi
f7d20b7cc2 Add XCode provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: I416b38459ef278f82af0379b46fd78f5ccc6512c
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:36:05 +00:00
Tony Sarajärvi
7a48b0d17c Add xz.sh provisioning script for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: I29879e17a18ffb7950c7a85db75f4bc2765741d5
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-09 08:36:02 +00:00
Tony Sarajarvi
f969320ac5 Add provisioning PKG install helper script for bash
Task-number: QTQAINFRA-1087
Change-Id: I93f33e2e93371f68f31a9ed8b4d9c89ee091b629
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:35:59 +00:00
Tony Sarajarvi
dd1b6e53b1 Add provisioning helper script for installing compressed files
This script downloads a file from a given URL,
uncompresses it and installs it to a desired location.

Task-number: QTQAINFRA-1087
Change-Id: I466cb81ec6c96bb0d46329ec98dcc4f31be173ec
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-02-09 08:35:56 +00:00
Tony Sarajärvi
d6f56195bc Add system setup provisioning for OS X 10.11
Task-number: QTQAINFRA-1087
Change-Id: Icba6d58c56fc00b4fe3a7a3f72050465ff64d104
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-02-09 08:35:54 +00:00
Liang Qi
15e396f7c3 Update submodules on '5.8' in qt5
Change-Id: I8c13bd75500b5fe21bde113b40b4e4161b8355f0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-08 08:34:46 +00:00
Heikki Halmet
ad97fd589f Provisioning: Visual Studio 2015 with update 3
Common install script for Visual Studio installation and
updates. Latest Visual Studio 2015 update is required
for releases

Change-Id: I5b41625ca7f161b4ba2d417797f8839ef175cdbc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-07 19:25:11 +00:00
Konstantin Tokarev
25160f24b6 Upgrade CMake to 3.6.2
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.

Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit 77eeee64a4)
2017-02-07 19:25:07 +00:00
Konstantin Tokarev
2835a4d873 Upgrade CMake to 3.6.2 on Windows 7 builder
Task-number: QTQAINFRA-996
Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
(cherry picked from commit daa8653121)
2017-02-07 19:25:03 +00:00
Simo Fält
f65479ee0c Upgrade CMake to 3.6.2 on Windows 8
Pyside requires CMake 3.0 or higher

Change-Id: Ic3f7eb4e89cd022364b1437fa8ff4476c86c3e47
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-07 19:24:59 +00:00
Heikki Halmet
c8372d3641 Linux android builds to RHEL 7.2
In 5.9 android builds will be using
RHEL 7.2 instead of 6.6

Task-number: QTQAINFRA-1096
Change-Id: Ia802aa31fe347616c829e2142991686fe8e95ed9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-06 12:07:46 +00:00
Liang Qi
5035a69e55 Update qtbase manually
Change-Id: I2e9330f0f037bd8637c4391fe5abde613aadc2ea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-06 08:02:38 +00:00
Jani Heikkinen
b071c82d19 Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9 2017-02-06 07:12:39 +00:00
Frederik Gladhorn
ce7b09a1fc Add speech-dispatcher-devel to RHEL
Without this Qt Speech is useless in our packages.

Task-number: QTBUG-58461
Change-Id: I5c93fae1b3a2987353c75865f1b0831114afedbf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-05 16:53:46 +00:00
Simon Hausmann
527829a600 Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ic7dab06f6b6e6cf326df651151eade22429b997f
2017-02-05 15:17:50 +01:00
Liang Qi
bbdeca02e9 Merge "Merge remote-tracking branch 'origin/5.6' into 5.8" into refs/staging/5.8 2017-02-04 14:20:27 +00:00
Liang Qi
4b45cd68d4 Update submodules on '5.8' in qt5
Change-Id: Ic3a06dd310fd7b67b53b95c8f6b1ef8813449fe5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-02-04 06:19:21 +00:00
Simon Hausmann
d641d6546b Merge remote-tracking branch 'origin/5.6' into 5.8
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_linux.sh

Change-Id: I10fcdfc0af68741d931f4732783bafdad2fffc4a
2017-02-03 09:15:43 +01:00
Heikki Halmet
a36977963a Provision: Storage android sdk and ndk version information
Sdk and ndk version information will be storaged to versions.txt.
Versions.txt will be used for all provision scripts and later on it's
data will be printed to provision log.

Also script name changed to match both android sdk and ndk.

Change-Id: I3366e596f539099c3b587466d90905d0889398fe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-03 05:47:05 +00:00
Heikki Halmet
6afffd6985 Provision: Script to print sw versions to provision log
This script is the last script that is run by provisioning. It will
print all storaged sw information to provision log

Change-Id: I2c76d5f7cccf9c116cb660ffcb67d3bece473da8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-02-03 05:46:57 +00:00
Joerg Bornemann
32b5e271a8 Update jom to 1.1.2
The most important changes that affect the CI are:
  - Fixed bogus path in error message for failed targets.
  - Fixed error "JobClient destroyed while still acquiring."
    that could be yielded for failed builds.
  - Fixed /k option (QTCREATORBUG-17131).
  - Added the special .NOTPARALLEL target that disables parallel
    build for the containing makefile. (This one is needed to
    build QtWebEngine in debug-and-release properly.)
  - Introduced the JOMFLAGS environment variable.
    This is a MAKEFLAGS pendant. JOMFLAGS is useful to set up
    separate flags for nmake and jom.

Change-Id: Icb2462d06b000a3fe29e1e9290b294cb1e900409
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-03 05:46:51 +00:00
Frederik Gladhorn
713188e4af Revert "Clean up usage of qtsvg as dependency"
qtdeclarative has a runtime dependency, some tests rely on the svg
module being available, so in order to not reduce the test coverage,
revert this change.
I'd like to see a better/cleaner separation, but for the time being,
better coverage wins.

This reverts commit fbd782636b.

Change-Id: I60d6b585e25e2e7c4f6ad705b754279968827842
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-02-03 05:46:43 +00:00
Heikki Halmet
0c8536fc0a Provision: Script for linux to remove preinstalled software
Script to remove tier1's preinstalled software. Script itself includes
all information about the software that needs to be removed from tier2
before provision starts to run installations. When this script is run
for certain platform that platform needs to provision all removed
software back to tier2 template. So user needs to make sure that all
needed provision script are available when calling this removal-script.
Goal is to have vanilla os when provision don't need to remove any
software before installations. When this goal is reached this script
and script calls can be removed from provision.

Change-Id: I048909800807fabb1dc599e768a90e7457fbc2cf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-02-03 05:46:33 +00:00
Oswald Buddenhagen
2c1d5ad754 Merge remote-tracking branch 'gerrit/dev' into 5.9 2017-02-01 21:04:15 +01:00
Kari Oikarinen
321d5f1488 Provision libusb-1.0 for Windows
It's needed by tqtc-boot2qt/qdb.

Change-Id: Id5b8b18a2090c040c3eec1bd3c4c521456245381
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-31 18:33:44 +00:00
Kari Oikarinen
db9682888c Add PS provisioning helper for 7-Zip files
Change-Id: Ice10e54137da8a0d2372019a195a63121fd00a8a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-31 18:33:41 +00:00
Liang Qi
07b72ae2c3 Update qtconnectivity manually
Change-Id: Ic3c8400ab26b09277752e5b9b347dc7a33679618
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-31 17:16:33 +00:00
Simon Hausmann
dfaa59fcb3 Bump Android API level to 21
This extends commit f3b0b9e292 to the
macOS and Windows platforms.

Change-Id: I180d81266897582cee1bec5938fbd3bb9c5c2ee3
Task-number: QTBUG-58367
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2017-01-31 12:37:11 +00:00
Liang Qi
a20cc5b452 Merge remote-tracking branch 'origin/5.8' into dev
Task-number: QTBUG-58371
Change-Id: I9d7027c72fb10b5cc549762d8bb1f13ee5ec9c5d
2017-01-30 10:00:59 +01:00
Liang Qi
9be869ba48 Merge remote-tracking branch 'origin/5.6' into 5.8
Task-number: QTBUG-58371
Change-Id: Ic3ec10a04ec9fcfea38324f6052b2d082c6ece58
2017-01-28 12:21:28 +01:00
Heikki Halmet
d4681ee690 Android sdk and ndk to provisioning for Windows 7
Installs latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.

Task-number: QTBUG-58369
Change-Id: Ib42f5149243fc5d262f6542e26726d1c8cbb2e8c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-28 03:57:41 +00:00
Liang Qi
98fa30e28e Update submodules on '5.8' in qt5
Change-Id: If492971dc4c714f7d11e693d13abc64d6bba83e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-28 03:56:27 +00:00
Liang Qi
0874dba009 Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I20aad260fd151fc3261548eead12cb23fa3127b6
2017-01-26 15:54:16 +01:00
Liang Qi
18967fce7d Update submodules on '5.8' in qt5
Change-Id: I51a509a5499af603c7eba23ba66b0ddb1eafa4f8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-26 00:13:35 +00:00
Oswald Buddenhagen
29a926f941 Adjust submodule branches
Change-Id: Ifd38a97f7b51138504e8d7ace030a175640bc216
2017-01-25 11:39:31 +01:00
Simo Fält
61c59c145b Restore RHEL 7.2 in the dev branch (5.9)
RHEL7.2 was disabled due to blocking configure change.

Task-number: QTBUG-58073
Change-Id: Ic517d53bddecbcf035410d4f22a678ab72e0d44d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-25 03:24:37 +00:00
Liang Qi
f8eb9821c3 Update submodules on 'dev' in qt5
Change-Id: I80604b065ad943f7bbddeb6dba4ba05a78ba2c05
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-24 22:37:07 +00:00
Heikki Halmet
3276f075b9 Provision: Set bash_profile to read .bashrc
The method (vmware tools) of launching a process inside a virtual
machine results in the launch of a process that does not originate
from a login shell. Therefore the CI system explicitly starts the
agent with "bash -l -c" to enforce the invocation as login shell
and thus execute settings from /etc/profile, ~/.bash_profile, etc.

This brings the behavior of the system closer to what we see as
developers.

However the shell is a non-interactive shell, therefore ~/.bashrc
is not read by default.

On Linux systems such as RHEL, ~/.bash_profile is configured to still
read ~/.bashrc.

For consistency we apply the same logic to the macOS configurations.

Change-Id: I417ecd7866bc4ae1b50beb14c19b456588b4050a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-24 19:19:27 +00:00
Heikki Halmet
eeea4e5c3a Add Android NDK/SDK to provision for macOS 10.10 and 10.11
Install latest Android sdk and ndk.
It also runs update for SDK API level 18

Task-number: QTBUG-58370
Change-Id: I1bf8cb42dd3e753be27fa9fcd2c1ac8ccbdb87c3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-24 19:19:24 +00:00
Jesus Fernandez
1b8b891910 Add Coverity-Id to .commit-template
Change-Id: Icb7321584c59f5322ae2fb6d75f9d1b7ba2fcfe2
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-01-24 10:23:27 +00:00
Liang Qi
84ed87b496 Update submodules on '5.8' in qt5
Change-Id: If8fe86b5faa11ef6a04a5433e325975e49361965
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-24 09:40:15 +00:00
Liang Qi
80358b1e1d Update submodules on 'dev' in qt5
Change-Id: Ia7ef89c8452841c3bbf56bada0060e977fd310cc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-23 15:33:13 +00:00
Liang Qi
1a3ff2b1af Update submodules on '5.8' in qt5
Change-Id: I05b0a2ab6493c9435a8a37d129decf0596a8b84d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-22 11:15:48 +00:00
Liang Qi
07cc7ef71a Update submodules on '5.6' in qt5
Change-Id: I57bbccaf30143e1ca8b56ca31a229b007111a34f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2017-01-22 10:28:45 +00:00
Alex Blasche
f3b0b9e292 Bump Android API level version to 21
This is required for new Bluetooth features in Qt 5.9+.

Change-Id: I2aa41117dfd93fc94d72012ca229bd2bc61f2bbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-21 07:58:40 +00:00
Liang Qi
3e4f86d652 Update submodules on '5.8' in qt5
Change-Id: Ib1144af40af6562020a0f46fb1d31107a5e1e0e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-19 16:10:16 +00:00
Qt Submodule Update Bot
ee19f88fe0 Update submodules on '5.8.0' in qt5
Change-Id: Ib32e222f05e3af71d9f194683ba57f792343924d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-01-19 13:09:05 +00:00
Oswald Buddenhagen
e74b0f7df4 Merge remote-tracking branch 'origin/5.8' into 5.8.0
This pulls in the CI build configurations.

These files were previously stored in the CI source tree, but they do belong
here. They describe the different configurations under which we want to build
Qt and its submodules, in terms of underlying virtual machine template, host
OS, target OS and CI related features that may also map to Qt configuration
features.

Task-number: QTQAINFRA-1074
Started-by: Simon Hausmann <simon.hausmann@qt.io>
Change-Id: I8ab9b987a28566ad036dcaf8f0663bd633fea439
2017-01-18 10:49:22 +01:00
Liang Qi
43c9b16100 Update submodules on '5.6' in qt5
Change-Id: Ie8aa9fd84a4b85c280831771c261b621238c9bf4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-17 05:29:11 +00:00
Liang Qi
b336c10c08 Update submodules on '5.8' in qt5
Change-Id: I6c8442fbe66f30e1c822efa0ff83387c25e6ac8f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-16 11:41:13 +00:00
Liang Qi
c7e283a595 Update submodules on 'dev' in qt5
Change-Id: Iadacad3bd0da1cd22299a6ef7a7f662530b5494f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-15 08:07:02 +00:00
Liang Qi
1ba2e08637 Update submodules on '5.8' in qt5
Change-Id: Ibd6924df667113c2a1c9b3a3e8f9c8d29c52c85c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-14 08:01:20 +00:00
Simon Hausmann
a34d812580 Merge remote-tracking branch 'origin/5.8' into dev
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
dev branch.

This is done within the same change as the merge to preserve atomicity.

Task-number: QTQAINFRA-1074
Change-Id: Ic47f7db3506ace4faca028b902d48cdb009c8495
2017-01-14 08:40:10 +01:00
Qt Submodule Update Bot
63d77a0b28 Update submodules on '5.8.0' in qt5
Change-Id: I13f342ad11d00e1d6df9af60290bbd97793b3a6d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-01-14 07:32:35 +00:00
Liang Qi
4d206f1fb6 Update submodules on 'dev' in qt5
Change-Id: I848fb61ce1e338d56bf665ad285d69b90bee06b9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-13 16:28:56 +00:00
Simon Hausmann
9de5f6957c Merge remote-tracking branch 'origin/5.7' into 5.8
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.8 branch.

This is done within the same change as the merge to preserve atomicity.

Task-number: QTQAINFRA-1074
Change-Id: Iac469c44048721530380ab577c6dbf1a6fa28211
2017-01-12 22:19:30 +01:00
Liang Qi
7b17d411f1 Update submodules on '5.8' in qt5
Change-Id: Id1cef4535c8f5ef2b7d366b73ca4335e2c58f2a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-12 16:47:52 +00:00
Liang Qi
d0bbf98cc9 Update submodules on '5.6' in qt5
Change-Id: I5599c7876c25f21fb286013a2d8cccda5efebe02
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2017-01-12 05:58:01 +00:00
Simon Hausmann
0f4fdb9490 Merge remote-tracking branch 'origin/5.6' into 5.7
This change also includes an update of the CI platform configurations to
the values that were previously in the CI source tree for builds of the
5.7 branch.

This is done within the same change as the merge to preserve atomicity.

Task-number: QTQAINFRA-1074
Change-Id: Ie7bde30bd64d439cd17ea789102550ab9fb44194
2017-01-11 16:29:06 +01:00
Simon Hausmann
3035f20934 Add CI build configurations
These files were previously stored in the CI source tree, but they do
belong here. They describe the different configurations under which we
want to build Qt and its submodules, in terms of underlying virtual
machine template, host OS, target OS and CI related features that may
also map to Qt configuration features.

Task-number: QTQAINFRA-1074
Change-Id: I7ce48e3b15da757166eeac7531478d3746c8aa7f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-01-11 13:57:45 +00:00
Liang Qi
4b6bff8044 Update submodules on '5.8' in qt5
Change-Id: I413f02de39f18259ab7bb10054ff75dc0ed04ed0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-11 12:22:47 +00:00
Heikki Halmet
2cf8327999 Provision: Cmake 3.6.2
Red Hat 6.6 needs cmake for GammaRay
OpenSUSE 42.1 and Ubuntu 14.04 needs cmake for pyside

Change-Id: I64b25be70057b86be7bfc96fb07446f7727bbefe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-11 10:05:59 +00:00
Tony Sarajärvi
8266919b6e Add provision helper file to install compressed packages
Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-11 10:05:50 +00:00
Tony Sarajarvi
2059ce3d2d Add DownloadURL.sh provisioning helper script
Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-11 10:05:40 +00:00
Tony Sarajarvi
da48107b08 Add provisioning try-catch helper script for bash
Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-01-11 10:05:21 +00:00
Liang Qi
96a8c36ee8 Update submodules on '5.8' in qt5
Change-Id: I0d6757349b933d131aa0eef501dc3e1509a545c4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-10 18:31:37 +00:00
Simon Hausmann
5f40fd649e Improve build performance on Windows
Disable the windows search indexing service, which has a tendency to start
indexing source code archives that we've just extracted. We are not interested
in this service.

Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2017-01-09 13:37:16 +00:00
Qt Submodule Update Bot
4cdbf1893f Update submodules on '5.8.0' in qt5
Change-Id: I32db28a8a7f6068aca3fb6c34c15998b569e3d5e
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-01-09 11:15:26 +00:00
Simon Hausmann
ab9b902f3f Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Id9533b63ae2e6d67d8c07101c406c40057c13b9f
2017-01-08 21:12:18 +01:00
Tony Sarajärvi
17c97ea79a Add provision helper file to install compressed packages
Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-01-08 16:28:50 +00:00
Tony Sarajarvi
2b2188cc77 Add DownloadURL.sh provisioning helper script
Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-01-08 16:28:39 +00:00
Tony Sarajarvi
c5e6abcafa Add provisioning try-catch helper script for bash
Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-01-08 16:28:32 +00:00
Qt Submodule Update Bot
e47e40eb1c Update submodules on '5.8.0' in qt5
Change-Id: If96f0ff600589f565235c471fa3380bbe9848914
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-01-07 08:07:10 +00:00
Simon Hausmann
15e1dc2054 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I9def17eb03e1c08d1e44c8f90841b1bf5160d638
2017-01-06 20:35:52 +01:00
Simo Fält
167e4fc36f Provisioning: Disable Windows Defender
This will reduct the timeouts coin has had recently with win machines.

Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-01-06 12:15:36 +00:00
Qt Submodule Update Bot
40addc7d81 Update submodules on '5.8.0' in qt5
Change-Id: I2cc710394ca9910d60bdf6d8e6079968a17f6270
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-01-03 15:26:13 +00:00
Simon Hausmann
26775d4e3e Merge remote-tracking branch 'origin/5.8' into 5.8.0
This brings in the Android OpenSSL fixes to allow the use of newer TLS
versions with Qt, the conan manifest updates to allow for provisioning
to work as well as a few other fixes from the stable branches.

Change-Id: If2e4a1b8a4c8e44cd8d9b8918a3083cbaf1b385c
2017-01-02 09:43:07 +01:00
Liang Qi
570c251596 Update submodules on 'dev' in qt5
Change-Id: Iea0ccd093912ab6a7ecb866c2592f23995a624d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-25 20:12:20 +00:00
Simon Hausmann
ffa5fe8b2f Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I49d18025acb322bf45b6cdc38adb05618cb90153
2016-12-25 18:12:11 +00:00
Liang Qi
7cfb602367 Update submodules on '5.8' in qt5
Change-Id: I496fe34b7f81ae099fdb0733f87268ed805df992
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-25 10:59:20 +00:00
Konstantin Tokarev
678fcb4e66 Updated conan manifests after modification of packages
Change-Id: I60eee501254d41b438085b7b687af6aa2c085dba
Reviewed-by: Vitaliy Slobodin <vitaliy.slobodin@gmail.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-24 07:32:20 +00:00
Simon Hausmann
591c6d0446 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	coin/provisioning/common/02-python.ps1

Change-Id: I6b5f2c464cc350798c7c73fba9e79a3f4f534586
2016-12-21 21:38:29 +01:00
Simon Hausmann
8a60455e61 Remove shutdown "helpers" for macOS
It turns out that they don't quite work the way we expected them to, and
instead we Coin is going to shut down the VMs directly at the right
time.

Change-Id: I9f7a6f2f898002a25544fc513a0c2414fcd5c263
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-21 11:32:28 +00:00
Qt Submodule Update Bot
10c4c43e52 Update submodules on '5.8.0' in qt5
Change-Id: I060ef5334c8d096c6167663b5c2dd8d45a5a2aec
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-12-20 09:19:36 +00:00
Simo Fält
ff1ad70a19 Provision: Install pyside python dependencies to Windows
To test successfully pyside dependencies with Coin, we need
python virtual env.

Change-Id: I59c620b7da9c78d2b5c55e233d75597b747a8e84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-19 21:39:35 +00:00
Simo Fält
fc6717cf23 Provision: Install pyside python dependencies to Linux
To test successfully pyside dependencies with Coin, we need
python-dev packages and virtual env.

Change-Id: I29a5eed769798da4e4799eb5ccdff1cd032070d5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-19 21:39:26 +00:00
Qt Submodule Update Bot
2c9249195d Update submodules on '5.8.0' in qt5
Change-Id: Id31eaddee9fe5f64def0e4ddf3b81007c7fead16
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2016-12-19 08:56:44 +00:00
Qt Submodule Update Bot
5664df0625 Update submodules on '5.8.0' in qt5
Change-Id: I2f0a28823f83b2980989b3070a6ee91e1957ee7e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-17 07:31:37 +00:00
Qt Submodule Update Bot
6c15dc0302 Update submodules on '5.8.0' in qt5
Change-Id: Ic73b70eb3399c4d1a69e76e0a55896ced61423b6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-12-16 19:55:39 +00:00
Heikki Halmet
e86ba9e1f7 Provision: Android openssl 1.0.2j for Windows 7
We are currently using too old openssl for Android builds in Windows 7.
Openssl version need to be at least 1.0.1.

This script will configure openssl 1.0.2j for Android using tools
from msys.

Change-Id: I9ab9a3b4f9f3953cf99bf15fee631f5a7961b42d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-12-16 14:44:55 +00:00
Liang Qi
79fa5f3c87 Update submodules on 'dev' in qt5
Change-Id: I37b7fb682d4d8db6cdc87ab8f10be55bc1094bd9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-15 18:06:00 +00:00
Liang Qi
f8252d7f1c Update submodules on 'dev' in qt5
Change-Id: I6624474fd032d697e851fa9ef0d087fde25195ae
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-14 14:48:58 +00:00
Liang Qi
94080ce9cf Update submodules on '5.8' in qt5
Change-Id: I867f4a94c3cc5ff7252339520cc10721937e1187
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-13 05:04:56 +00:00
Liang Qi
2f9d551948 Update submodules on '5.7' in qt5
Change-Id: I87579c99e2ee1c2b7ab4d1cf3d403443f215cddb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-12 08:18:36 +00:00
Liang Qi
79e3c32051 Update submodules on 'dev' in qt5
Change-Id: I6da970179afdf84cc629190c1a8b2595c35d4a06
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-12 07:29:06 +00:00
Qt Submodule Update Bot
6199444cce Update submodules on '5.8.0' in qt5
Change-Id: I9dee754f6b2ea4be834a483012ec8e13fe72c8c8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-12-11 14:29:27 +00:00
Liang Qi
42e12a14f0 Update submodules on '5.8' in qt5
Change-Id: I245111cba87f41dfb18ca13527960d24e0a84700
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-10 19:02:18 +00:00
Qt Submodule Update Bot
46d87fb50e Update submodules on '5.8.0' in qt5
Change-Id: I602ac700f615b32917a16cc368403978869b0c9a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-12-10 16:29:33 +00:00
Liang Qi
4cc6c5b7ee Update submodules on '5.8' in qt5
Change-Id: Iab0f72430400b83be8664c232394959d81a9f28c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-09 20:12:45 +00:00
Qt Submodule Update Bot
0b3ea7ef1b Update submodules on '5.8.0' in qt5
Change-Id: I288795ff5b32bb847d17f1ae9828bc1c83102e8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-12-09 18:22:00 +00:00
Qt Submodule Update Bot
a6cf19107c Update submodules on '5.8.0' in qt5
Change-Id: Ia2d83e159b8648958cb123045aabd254330287ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-12-08 10:10:22 +00:00
Simon Hausmann
16d05b088e Improve disabling of screensaver on macOS
Setting the idleTime on currentHost works well, until the hardware UUID changes
and thus the host ID for the setting. With kvm that happens quite frequently,
with vmware less but also occasionally (deep clone for example). By disabling
the screensaver on start-up we can cover all cases quite easily.

Change-Id: Ibdcf404430656f9caa47386ca3c732366ddfc8c7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2016-12-08 08:18:56 +00:00
Qt Submodule Update Bot
8afbd91698 Update submodules on '5.8.0' in qt5
Change-Id: Ie42264d273d73c32f2763ed3c9dfa7dcb1ede5d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-12-07 18:59:00 +00:00
Jędrzej Nowacki
0ce4f02c5f Suppress shutdown indicator in Ubuntu
We want to quit machines without being asked, if we are
really sure.

Change-Id: Ic7156f5b0fe236c0270d8c2e4fcc322a82776caf
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-12-07 13:48:24 +00:00
Simon Hausmann
be37958406 Disable the screensaver on macOS definitely and permanently
Change-Id: I8856eebfe91b9e1cc2cc318a1e7ea80348f1486e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2016-12-07 13:47:48 +00:00
Simon Hausmann
3718450891 Fix paths for provisioning on macOS
The directory names were missing the architecture, otherwise the content was
unused.

Change-Id: I0316da5c4b1352012f27ce330c3319a8aedf01ea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2016-12-07 13:47:46 +00:00
Frederik Gladhorn
d0552ebf2d Fix macOS provisioning not shutting down cleanly
After provisioning we want the machine to be sensibly shut down since we
will use the disk image later. VSphere doesn't manage to shut down 10.8
VMs. Help out by calling shutdown.
For the other OS X/macOS versions, this is also desirable since
controlling the power state of these machines is hard with different
virtualization solutions (we're looking at OpenNebula/KVM).

Change-Id: Ieabc14f9c8c1af9421a0ef91dd670f4790a84461
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2016-12-07 13:47:42 +00:00
Liang Qi
97e6ed74e4 Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
	.gitmodules

Change-Id: I749924de83f87e436448bf1287fe057e2fe4c45b
2016-12-05 10:00:11 +01:00
Liang Qi
91191afe3f Update submodules on '5.8' in qt5
Change-Id: Ibfed6d06a7f83a124b185c18ee690b2fb3141271
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-04 14:26:31 +00:00
Liang Qi
2c27ccd1c9 Merge remote-tracking branch 'origin/5.7' into 5.8.0
Change-Id: Ic9a6b04afe47529c4f953bace93e9c17d8c4d39d
2016-12-02 09:02:23 +01:00
Liang Qi
38c422a405 Update submodules on 'dev' in qt5
Change-Id: If15f5387b25fd86b6b1b481f0ec25928304d8c05
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-01 09:42:08 +00:00
Liang Qi
d379d768e6 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ib22c9e0f5c3e7c256ca083de33e6ad0475f20ce9
2016-12-01 09:58:28 +01:00
Liang Qi
877b3b9991 Update submodules on '5.8' in qt5
Change-Id: I0af8e18f49f251a347eb5afd9037bd0462edc9a9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-12-01 06:20:02 +00:00
Liang Qi
794392344d Update submodules on '5.8' in qt5
Change-Id: Ib16f362b961d0522c5f990d59f1e5d3974992190
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-30 18:36:09 +00:00
Konstantin Tokarev
860b38110b Copy conanfile to conanbuildinfos directory
Conanfile is required for running "conan imports" as a part of "make install"
procedure, however its original location is unknown to build system of
module.

Conanfile is copied with its conventional name "conanfile.txt" to avoid
tying module build system to more qt5.git layout peculiarities. In
future we may want to have several conanfiles in one provisioning dir,
like qtwebkit-mingw.txt and qtwebkit-msvc.txt.

Also simplified syntax of PowerShell variables interpolation, $() is needed
only for interpolating expressions.

Task-number: QTQAINFRA-998
Change-Id: I6904e80f4f85bb5269b0830272c6eaa2c8100789
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-30 15:31:55 +00:00
Konstantin Tokarev
7dc66c9528 Updated conan to 0.16.0
* Use --no-imports when installing packages, imports will be performed
on "make install" step with new "conan imports" command.
* Add txt generator to all conanfiles because it will be needed for
"conan imports".

Change-Id: Ie5e7ac6bfbf14dfa32ce82136b6be5e39476e393
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-30 15:31:52 +00:00
Oswald Buddenhagen
150071b395 don't fail to check out some modules in pinned mode
when used without the --branch option, we clone with --no-checkout, to
avoid unnecessarily checking out files twice when the recorded sha1
doesn't happen to be the tip of the default branch. however, that would
leave the index in a dirty state which would make the subsequent
submodule update abort at some point, silently.

to deal with the problem, we ignore this type of index dirtyness and use
submodule update with --force.

Task-number: QTBUG-57289
Change-Id: I6fc9693b0eaadfb04d2d80f9c8f1f2e11be47ae9
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2016-11-30 15:12:13 +00:00
Oswald Buddenhagen
977f0841e4 refuse to operate with dirty submodules
the operation would later error out anyway, after spending a lot of time
fetching the remotes, and leaving a partially updated state behind.

Change-Id: Ib2a688e446a9bd4ba3b15fc73082224433c18388
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2016-11-30 15:12:07 +00:00
Liang Qi
75f605743c Update submodules on '5.6' in qt5
Change-Id: I88a559589ffd21c7436df6c644c92db21244860d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-30 12:22:14 +00:00
Qt Submodule Update Bot
aed00a8dd3 Update submodules on '5.8.0' in qt5
Change-Id: I0222dbc952686d2bad1f4878a61047ace3fd4dce
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-30 05:38:04 +00:00
Liang Qi
b461645ce9 Update submodules on 'dev' in qt5
Change-Id: Ib6ed9acdc2de652ed0581ab2ce322bea072fec07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-26 20:12:41 +00:00
Liang Qi
18a8082944 Update submodules on '5.8' in qt5
Change-Id: I602135f4911ae5dd19f188582f3b124eace332fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-26 20:08:33 +00:00
Liang Qi
b2d2d7bfff Update submodules on '5.8' in qt5
Change-Id: I102175b389cd2470429d0b30bd2be1c92b90b5cf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-26 12:25:31 +00:00
Liang Qi
b74a26b980 Update submodules on '5.6' in qt5
Change-Id: Id212d3e785bef2ca0aa0d9fad3b7933369626643
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-26 10:23:43 +00:00
Liang Qi
ad1fc7cc5d Update submodules on '5.7' in qt5
Change-Id: I81e9785dce8bbbe6bada7d90732cda708c98d0a4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-26 10:22:00 +00:00
Liang Qi
8aa0940eef Update submodules on '5.7' in qt5
Change-Id: I5bc3cdd755a3e29c936c1db7c51d0e1418be3a97
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-25 20:38:40 +00:00
Frederik Gladhorn
a7c6550fff Add basic Ubuntu 16.04 provisioning
Change-Id: Iaae5bb295bfd48cc5bc036baef9b0fa899d393ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-25 11:05:49 +00:00
Liang Qi
a2762b0f57 Update submodules on '5.6' in qt5
Change-Id: I65e6b60cdc03f25d050854c68220fa96ee140bf6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-25 05:25:56 +00:00
Liang Qi
c28672909f Update submodules on '5.8' in qt5
Change-Id: I3c22d33c28648ff6a9992200629e827533186fe1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-24 06:36:11 +00:00
Konstantin Tokarev
7a1f4adf31 Update Ruby on Win7
QtWebKit requires newer Ruby than version installed on Windows 7 builders.
Install the same version as is installed on Windows 10 builders.

Task-number: QTQAINFRA-997
Change-Id: Id8e5d47028ef8403bb28daf1446d95dc8f2ab564
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-23 20:49:49 +00:00
Konstantin Tokarev
8114c71554 Added conan zlib package for MinGW on Windows 7
Change-Id: I48d904e95fce905b15b0099fee956c06773c4a75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-23 08:46:30 +00:00
Liang Qi
c32c2d4238 Update submodules on '5.6' in qt5
Change-Id: I885a6ee78c480bda7f325a21d73d3f95863f9ad4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-23 04:19:54 +00:00
Liang Qi
6caace33b4 Update submodules on 'dev' in qt5
Change-Id: I301370485589fd11d69a3722e29818f037c75b43
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-22 20:07:31 +00:00
Liang Qi
0f8f2edbbb Update submodules on '5.7' in qt5
Change-Id: I96e1ca64b6c2f6d4abb318d8e55f865eb24d4465
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-22 19:38:13 +00:00
Tony Sarajärvi
e0912a9cea Provision OPENSSL env variable for openSUSE 13.1
Fix building on OpenSuse after openssl update.
Every linux distro seems to patch openssl in a different way to deal with
broken/outdated SSL issues. We seem unable to detect what suse did when
running configure, so this is a stop-gap measure.

Change-Id: I5e375e9c5c1615358dbce0b8dd91476cb4f4e45b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-22 14:29:51 +00:00
Liang Qi
ae782a7f22 Update submodules on '5.8' in qt5
Change-Id: Ife77ec1889a7791fec833343329fc0c6b3345b34
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-22 09:07:06 +00:00
Liang Qi
b87529c258 Update submodules on '5.6' in qt5
Change-Id: I73b32ee6ef5a643c78bb297230fb675a5a3dd64f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-22 07:08:26 +00:00
Qt Submodule Update Bot
7039b9f58b Update submodules on '5.8.0' in qt5
Change-Id: Icffc85eb59ad4aca8eae32d74eb5ad34be37580e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-11-22 06:46:55 +00:00
Oswald Buddenhagen
bf4f3a434a Adjust submodule branches
Change-Id: I154feb1976da9853cb4de7e70a4962ad0a6b4067
2016-11-21 12:48:41 +01:00
Liang Qi
53334e89e1 Update submodules on '5.7' in qt5
Change-Id: Ibd8707fd3c3219d7777bb4a82cfbbbf31837e960
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-20 23:39:13 +00:00
Liang Qi
4a9271061a Update submodules on '5.8' in qt5
Change-Id: I5bb5f2c2af231ce4e5d483448cb000c3d20e1cf1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-18 22:28:49 +00:00
Konstantin Tokarev
fa00780be3 When installing Python ensure that pip is installed too
If Python is not deinstalled cleanly (01-windows_removethemall.ps1
just erases installation directory) pip is not bootstrapped by new
installation. Fix it by running ensurepip module.

Change-Id: I3a7ed87eed30118876d7022eed94b8a571677529
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-18 22:19:26 +00:00
Konstantin Tokarev
aafc3f8644 Use full paths for invoking stuff from Python27\Scripts
Change-Id: I52094cc4b27b9e3a6fe3dd12c504777b8bb7bc75
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-18 22:19:23 +00:00
Konstantin Tokarev
a561a58bb6 Fixed broken conan manifest in qtci-windows-7-x86
Change-Id: I5c88b0d6e8ee6d8599b800a713d65111fbb4ad2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-18 22:19:20 +00:00
Konstantin Tokarev
48507e9e3c Provisioning should fail in case of conan errors
Change-Id: I54ee86f5cf0f39cd7bafe71682b93a2a3c8fce5c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-18 22:19:18 +00:00
Konstantin Tokarev
1bf242603c Rename conan.ps1 and python.ps1 file in configuration dirs too
Order of files really matters in configuration directories, but I
renamed only main implementations in previous commit. Fixed that.

Change-Id: Ia541fa8fd36b3d52580ba9814e9f4c38aadce460
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-18 22:19:14 +00:00
Liang Qi
98861ac13d Update submodules on '5.7' in qt5
Change-Id: I158e1550ffa19117258088b718dfaaa9d3f110df
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-18 08:05:04 +00:00
Liang Qi
8894622064 Update submodules on '5.6' in qt5
Change-Id: I6635f499760dbd4b58e0c65150c886b64ece8391
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-18 08:04:38 +00:00
Liang Qi
e75eff13f1 Update submodules on 'dev' in qt5
Change-Id: I0c6056a80c3b5a078f8fe7e3a28206d50856fcb0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-17 21:01:11 +00:00
Liang Qi
1e73f4067c Update submodules on '5.8' in qt5
Change-Id: Ic90a01c01d497d9041dadc892ed95c4b55cc3dd8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-17 17:55:40 +00:00
Liang Qi
acd40269d3 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1c5420f9d0a192f55623b2d46aec7a15b7877609
2016-11-17 11:41:55 +01:00
Qt Submodule Update Bot
42e9690d41 Update submodules on '5.8' in qt5
Change-Id: I9ce3b5468ba7249b07fefbe8cf015e7f136dfc12
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-17 08:24:41 +00:00
Konstantin Tokarev
f8e075a679 Install conan from pip instead of exe
This allows us to get it working on 32-bit Windows.

Also renamed conan.ps1 and python.ps1 to get proper provisioning order.

Change-Id: I2f21db7dd0edbacb4e44024d1c70b315fba55801
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-16 21:25:32 +00:00
Konstantin Tokarev
f910b2bbf9 Added MinGW support to conan.ps1, and conanfile for MinGW on Win 7
Change-Id: I0442437b33afd0195745a03301440e5eea6d4897
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-16 21:25:26 +00:00
Konstantin Tokarev
19c10b941c Verify conan manifests when installing packages
This check allows us to ensure authenticity of installed files.

Manifests are sorted to minimize diffs in future updates.

Manifests lack trailing newline, because adding it would break manifest
parser of conan 0.15.0.

Task-number: QTQAINFRA-998
Change-Id: I6db75a78ce552da29d63cc4ac03726df326b7be2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-16 21:25:21 +00:00
Konstantin Tokarev
93240adad1 Fixed conanfile options after packages were renamed
Change-Id: I4dbd3ec43bb6edfff7b9f98ac697cc7b70b09cda
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-16 21:25:15 +00:00
Qt Submodule Update Bot
77741d7d6c Update submodules on '5.7' in qt5
Change-Id: Ia039f19c48f0e6140da7113288cd4c3b5e71ffd9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-16 07:06:30 +00:00
Qt Submodule Update Bot
98c92cc95f Update submodules on '5.6' in qt5
Change-Id: Ieda66165e735256fa25f335804f54d3574bdcd25
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-16 05:23:01 +00:00
Qt Submodule Update Bot
b308713d63 Update submodules on '5.8' in qt5
Change-Id: I15c7339a78428a167ac1f8fb74faa08d622b957c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-15 11:05:09 +00:00
Oswald Buddenhagen
6773d4ef94 produce less ugly paths to the commit template in submodules
Change-Id: I7ebf3c46088e193c8f4605532c1f4a1b6d62d230
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2016-11-14 12:17:36 +00:00
Oswald Buddenhagen
357d29a002 add --no-fetch option
there is no point in re-fetching all repositories just because an update
failed due to local modifications.

Change-Id: Ie9883586d77f3310058353844f0bbcfb0b775ebb
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-11-14 12:17:33 +00:00
Qt Submodule Update Bot
f9ef2cad3c Update submodules on 'dev' in qt5
Change-Id: Ic6fdae41e0064726fa0349e6d153ce1ce6cabdba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-13 07:21:47 +00:00
Qt Submodule Update Bot
7f78ad5d04 Update submodules on '5.7' in qt5
Change-Id: I78258b727f35536b5ec7852a175922f0852653cf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-12 18:24:59 +00:00
Qt Submodule Update Bot
1807cf7a38 Update submodules on '5.8' in qt5
Change-Id: I7ad982a779dd3b1856f6bfd1b1e769022a1b27a7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-11 23:12:51 +00:00
Qt Submodule Update Bot
d9141a32be Update submodules on '5.6' in qt5
Change-Id: Ib475bf7c1fcab721cc884313a6c9dd1426a46ad6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-11 23:12:26 +00:00
Liang Qi
4846460da8 Update submodules on 'dev' in qt5
Change-Id: I8cd3169f2fd6d00006175b8012134450e44b3bb3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-11 06:56:35 +00:00
Qt Submodule Update Bot
aba872f2dd Update submodules on '5.8' in qt5
Change-Id: I6514b942b7346a91ba3ad88af968286b6a859044
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-10 05:37:07 +00:00
Konstantin Tokarev
b1964fc7e5 Upgraded conan to 0.15.0
Change-Id: I9219094dfffb4edd90fcab00fb28c8b7658cfb42
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-09 18:33:39 +00:00
Liang Qi
b198efeffb Update submodules on '5.8' in qt5
Change-Id: I77ff5ade4c00778ccecf52667e9f514712344680
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-09 16:25:01 +00:00
Qt Submodule Update Bot
70fd49d277 Update submodules on '5.8' in qt5
Change-Id: I813d7017a69fc6550787880e6211f07dd9979851
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-07 16:53:43 +00:00
Konstantin Tokarev
daa8653121 Upgrade CMake to 3.6.2 on Windows 7 builder
Task-number: QTQAINFRA-996
Change-Id: I84867a5b630c4cf1e712047c58c6cad9e5e43800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-07 11:59:05 +00:00
Konstantin Tokarev
05f4779eae Update package names and options in qtwebkit conanfiles
Task-number: QTQAINFRA-997
Change-Id: I19634c06041286fe44c787efe038d5ab24888b1f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-11-07 11:59:03 +00:00
Qt Submodule Update Bot
829820f51a Update submodules on '5.7' in qt5
Change-Id: I8c0dd734d7e74a7ccd6419211de705be4bf5dd25
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-05 20:06:05 +00:00
Qt Submodule Update Bot
2c1bc72b22 Update submodules on '5.8' in qt5
Change-Id: Ida45b8f7371489e823fae95759835895805600b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-05 08:58:46 +00:00
Oswald Buddenhagen
71ed40b0ac fix cloning of tagged versions
the .gitmodules of tagged commits typically refers to a release branch
which was deleted shortly after the release. consequently, git clone
--branch is bound to fail.

of course, cloning a fixed sha1/tag requires no branch in the first
place, so revert back to using git clone --no-checkout in that case.

amends ac6168c0c.

Task-number: QTBUG-49133
Change-Id: Ica032f1d07a70ad89f16b23bdf5cdab785612fdc
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2016-11-04 12:42:26 +00:00
Qt Submodule Update Bot
4cbc319413 Update submodules on '5.6' in qt5
Change-Id: Ic9d3ad8264dfc543f8bac4bda81b82c7f92fe176
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-04 12:42:22 +00:00
Qt Submodule Update Bot
d483ed9fd1 Update submodules on '5.8' in qt5
Change-Id: I08e288a112a342efec122fdd6ceabe8c6ad9ea94
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-03 17:54:55 +00:00
Qt Submodule Update Bot
647afd7f41 Update submodules on '5.6' in qt5
Change-Id: I3f4f3b15e3528c319c1479759282571759477faf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-03 11:37:11 +00:00
Qt Submodule Update Bot
0cacec9365 Update submodules on '5.7' in qt5
Change-Id: I7b50d64a16e3dfbfdfc153cc06c2dd0af73734f5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-03 08:24:39 +00:00
Qt Submodule Update Bot
8835d34cae Update submodules on '5.8' in qt5
Change-Id: I2671f23d719d22a3e330a9b6f1eb271d7da74e1a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-11-03 05:36:58 +00:00
Frederik Gladhorn
fbd782636b Clean up usage of qtsvg as dependency
There is no build dependency on QtSvg in qtdeclarative or qtquick1, so
don't recommend it for builds. QtSensors on the other hand has an
example that does need svg.
This does not change anything in the big picture, the svg module will be
built as always and svg files will be displayed. The change is the
ordering of builds (leave more room for parallelization).

Change-Id: I50e527e03a75742036d5f914611d0b34437a8e3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-11-02 21:09:02 +00:00
Qt Submodule Update Bot
6fd9e533a3 Update submodules on '5.6' in qt5
Change-Id: Ib4bc5819e056a5571967aa9919d5a092834c28a7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-31 08:16:44 +00:00
Qt Submodule Update Bot
6fe694ef9e Update submodules on '5.8' in qt5
Change-Id: I24dadef83afb66c4cc6d3ee96cb753e9c12c6e87
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-30 12:03:53 +00:00
Qt Submodule Update Bot
3ec0bc3251 Update submodules on '5.6' in qt5
Change-Id: I4ef33095de23bbf2878f796e036ad6fd5e7d69df
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-29 16:55:04 +00:00
Qt Submodule Update Bot
7cf1472896 Update submodules on '5.7' in qt5
Change-Id: Ib7052a661f2b881e5dd45e7e0660ac3b9f2be0b0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-29 12:04:28 +00:00
Qt Submodule Update Bot
1121bd050b Update submodules on '5.8' in qt5
Change-Id: I762434e6bb122ac5118e73672ce443bb3009d829
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-10-28 01:50:03 +00:00
Qt Submodule Update Bot
d84827a04c Update submodules on '5.6' in qt5
Change-Id: I4ecaec417836737c4d428dbfe69261666d1330eb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-27 18:25:25 +00:00
Liang Qi
d4330b54d9 Update submodules on '5.8' in qt5
Change-Id: Iedd29491fc105df54ab9e670bea8f1d0becb1e23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-27 11:16:24 +00:00
Fredrik Orderud
e0d82e099c Update qtquick1 submodule on '5.8' in qt5
Fixes broken build caused by qtquick1 not being in sync with interface
changes in qtbase.

Task-number: QTBUG-56642
Change-Id: I972bcef2564c4f9bd7abe1a3e38c77339aaf30e9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-24 09:37:11 +00:00
Qt Submodule Update Bot
dffdec4c38 Update submodules on '5.7' in qt5
Change-Id: I346c0d758f888c917e57c5e784063d26fc87ccb4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-23 06:26:57 +00:00
Qt Submodule Update Bot
79f1945c39 Update submodules on 'dev' in qt5
Change-Id: Ic719d17edc11df7808a381627695655ba659148f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-22 06:29:43 +00:00
Qt Submodule Update Bot
5706c177a2 Update submodules on '5.6' in qt5
Change-Id: Iefe7bd1ea3f99dee7503a8ae2bc62ce965121029
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-22 06:28:46 +00:00
Qt Submodule Update Bot
9f921b9cc3 Update submodules on '5.8' in qt5
Change-Id: I70a3a9621a800f655406d4827f533c2378963312
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-21 17:00:51 +00:00
Qt Submodule Update Bot
161dcd9117 Update submodules on '5.8' in qt5
Change-Id: Ia4c6e9eae9eab645779dfc31818527fcef3e5fe2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-21 04:45:36 +00:00
Qt Submodule Update Bot
6f7ad4c6f5 Update submodules on 'dev' in qt5
Change-Id: I1aa41dfd34b34f97a515a2969f512c41386137e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-20 07:29:55 +00:00
Qt Submodule Update Bot
feae87fc48 Update submodules on 'dev' in qt5
Change-Id: I9fb801475eb21c37d5d33b4fb14d4700554a5149
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-19 12:47:10 +00:00
Liang Qi
b5e7776935 Update submodules on '5.8' in qt5
Exclude qtbase to avoid QTBUG-56580.

Change-Id: I70cd6027112a94824fdea2264866bfaeda8ee41c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-18 16:06:27 +00:00
Liang Qi
d541bad5b0 Update submodules on '5.8' in qt5
Change-Id: I30d63257b6a095fd75c41bf97e24f584374eb542
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-17 21:42:40 +00:00
Qt Submodule Update Bot
f2bae3b27d Update submodules on '5.7' in qt5
Change-Id: I37d33578ba4b2e48403226c8a41ff289f77ebf1a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-15 19:28:06 +00:00
Qt Submodule Update Bot
7f941c05ca Update submodules on '5.7' in qt5
Change-Id: If8ce107ce65ebde81732c1ccbc1b2212eb2ac89b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-14 14:39:48 +00:00
Qt Submodule Update Bot
683e24bd51 Update submodules on '5.6' in qt5
Change-Id: Id6ff55fb87154f79a136784c5fe4f63711183fa4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-14 06:48:35 +00:00
Liang Qi
6d2714d6be Update submodules on '5.8' in qt5
One more without qtdeclarative update.

Change-Id: I45afafd217da9153c7ce18336f9ab1d5d9530d8b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-13 07:33:24 +00:00
Qt Submodule Update Bot
4796403663 Update submodules on 'dev' in qt5
Change-Id: Ic0831856c7b3d9014068c48f10d776085e16ba7c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-12 01:30:52 +00:00
Qt Submodule Update Bot
a54d8b1f30 Update submodules on '5.6' in qt5
Change-Id: I62cae7b521df5e7c9073c3361017a74d3355a1e0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-11 23:09:35 +00:00
Frederik Gladhorn
837f579a8c Update submodules on '5.8' in qt5
Since qtdeclarative seems to trigger a crash in qtquickcontrols' tests,
leave it out for now, just to see some progress.

Change-Id: I8799f0ae70ad9b78f5be4cb7a53cbeac7df3295b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-10-11 20:58:19 +00:00
Qt Submodule Update Bot
f2fc36b021 Update submodules on '5.7' in qt5
Change-Id: Ib91dfec2ce8b7e794a26367f658581672d5cc2e2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-10 05:44:06 +00:00
Qt Submodule Update Bot
bb9da70be6 Update submodules on '5.6' in qt5
Change-Id: Iefa745df986d2794dfdcb7454733122334d5192c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-09 14:26:21 +00:00
Qt Submodule Update Bot
d6fcb8ba76 Update submodules on '5.6' in qt5
Change-Id: I186da5a92032e37abcfbaa96e393f2dd2304d181
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-08 08:40:25 +00:00
Liang Qi
766a4f11ea Update submodules on 'dev' in qt5
Change-Id: I33398bb5031c34b1afb24d992fdaebca86e987d1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-07 22:37:57 +00:00
Qt Submodule Update Bot
0750f2b6ce Update submodules on '5.7' in qt5
Change-Id: I0fcbfa1705b1c2a93f5ced9a07d300e18ae9b7b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-07 21:17:31 +00:00
Liang Qi
741efb1f91 Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: Ib37d1a012dad4bcb3b830d2557dab1ed6cb091ea
2016-10-07 08:23:05 +02:00
Liang Qi
bf9ed6466f Update submodules on '5.8' in qt5
Change-Id: I423324fe84f2bb434fad8a717d05eae680a94e69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-06 17:41:36 +00:00
Liang Qi
bb430e6222 Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: Ic1d8d79b979cb77fe93acae2c279cf8a4f4e2a71
2016-10-06 12:11:18 +02:00
Konstantin Tokarev
5b0a9d688b Log arguments passed to Start-Process in Run-Conan-Install
Task-number: QTQAINFRA-998
Change-Id: Ic27762a0403132cb8c2dcdb9f5a83ae9292e2d2a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-05 21:25:43 +00:00
Konstantin Tokarev
cf257c2869 Pass compiler.runtime setting to conan
When MSVC is not autodected, necessary setting compiler.runtime has
undefined value, breaking installation of packages. This setting is not
supported by MinGW, so it should be optional.

Task-number: QTQAINFRA-998
Change-Id: Ia1a09eee14275314c160c7c45cd6ab276367dcdb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-05 21:25:35 +00:00
Konstantin Tokarev
433f6dddb5 Execute Conan installer synchronously
PowerShell runs .exe's asynchronously by default, unlike all other commands.
This behavior creates race condition when conanfile processing starts before
conan installation is completed. Addition of "| Out-Null" to installer
invocation makes it synchronous.

Task-number: QTQAINFRA-998
Change-Id: Ic423514f15886e6ad9eb5c9422dd5382a3362380
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-05 21:25:28 +00:00
Liang Qi
e5627e6de3 Update submodules on '5.7' in qt5
Change-Id: Ifb5d6145b2c4b4bf881cf6414d2b5c76382c8757
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2016-10-05 14:38:22 +00:00
Liang Qi
eb78767825 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	coin/provisioning/common/helpers.ps1

Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
2016-10-04 11:10:59 +02:00
Qt Submodule Update Bot
7b8fe9c0ed Update submodules on 'dev' in qt5
Change-Id: I737902b8cc54ce8394c377f6cdafe14c49c2a588
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-04 04:57:22 +00:00
Qt Submodule Update Bot
bc65857c58 Update submodules on '5.7' in qt5
Change-Id: Icb268cea1648c3219be1bb2ac8d9819971e9a033
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-10-02 20:52:35 +00:00
Liang Qi
538d7a0538 Update submodules on 'dev' in qt5
Change-Id: Id24be2272e6fe7256c6f96c1c54c2baf933f793f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-01 13:03:28 +00:00
Qt Submodule Update Bot
6ddf18df95 Update submodules on '5.8' in qt5
Change-Id: I3edb8eeb7f599148ba577aea3c6677e8e6423d69
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-10-01 08:48:43 +00:00
Konstantin Tokarev
680c596ca0 Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR"
This actually breaks conan integration in Coin instead of fixing it.

This reverts commit b0b0c9c471.

Change-Id: Ifbdc9dbfd89d5b670221463e6d303691ad45936d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-10-01 06:35:46 +00:00
Liang Qi
0e4688d36e Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
	.gitmodules

Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
2016-09-30 16:13:52 +02:00
Liang Qi
792f91dc87 Merge remote-tracking branch 'origin/5.6.2' into 5.6
Conflicts:
	.gitmodules

Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d
2016-09-30 14:36:23 +02:00
Heikki Halmet
c9d71e9eeb Python to provisioning for Windows
Installs Python version 2.7.10.
Python is required for building Qt 5 from source. More
specifically qtdeclarative and qtwebkit require it.

Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-09-30 08:31:18 +00:00
Liang Qi
a5b6125466 Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
2016-09-30 09:27:59 +02:00
Konstantin Tokarev
77eeee64a4 Upgrade CMake to 3.6.2
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.

Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-30 07:20:41 +00:00
Simon Hausmann
6fabd34960 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
2016-09-28 16:41:56 +02:00
Qt Submodule Update Bot
657cab9312 Update submodules on '5.7' in qt5
Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-09-28 04:43:38 +00:00
Simo Fält
1148171a5d COIN Provisioning: Install ICU to RHEL 7.2
Change-Id: I9d99c9e8a10b89f430fd6a07932b9330cfb49726
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-28 04:36:48 +00:00
Simo Fält
06c59b27db COIN Provisioning: Disable selinux in rhel 7.2
Change-Id: I03c2b70e4c05440c6cf1a6d355f5800c67f62bb7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-28 04:36:40 +00:00
Qt Submodule Update Bot
40399ae1cc Update submodules on '5.8' in qt5
Change-Id: Ia2e717ea4f71a3032146f3fc8b98f96d141f1f92
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-09-28 04:36:31 +00:00
Qt Submodule Update Bot
5ee2290c0c Update submodules on '5.6' in qt5
Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-09-27 04:59:22 +00:00
Konstantin Tokarev
b0b0c9c471 Changed slash direction in CI_CONAN_BUILDINFO_DIR
Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-26 13:51:15 +00:00
Qt Submodule Update Bot
c5557d43ee Update submodules on '5.6.2' in qt5
Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-09-25 14:19:10 +00:00
Qt Submodule Update Bot
ec6d9b53b4 Update submodules on '5.7' in qt5
Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-25 14:00:21 +00:00
Qt Submodule Update Bot
cce1584b78 Update submodules on '5.8' in qt5
Change-Id: Iec230ba54c75039fe1b0506540e52a598fff2510
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-25 09:53:20 +00:00
Qt Submodule Update Bot
dcc26dafad Update submodules on '5.7' in qt5
Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-25 09:04:39 +00:00
Qt Submodule Update Bot
233d142e8e Update submodules on '5.6' in qt5
Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-09-24 22:00:52 +00:00
Qt Submodule Update Bot
3f7e68f8c0 Update submodules on '5.6' in qt5
Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-24 04:30:02 +00:00
Qt Submodule Update Bot
69d08a86b0 Update submodules on '5.8' in qt5
Change-Id: Ie862b6f2ec78e6c24f8f5bd0ee959e598f3d33d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-24 04:28:05 +00:00
Qt Submodule Update Bot
0ad453a0fd Update submodules on '5.6.2' in qt5
Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-09-23 09:12:36 +00:00
Qt Submodule Update Bot
7c6a3f423a Update submodules on '5.7' in qt5
Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-09-23 08:23:40 +00:00
Qt Submodule Update Bot
cb480a3860 Update submodules on '5.8' in qt5
Change-Id: Ic9386ba7ad3b9a28180719440af6eeb64f4483ff
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-22 05:15:15 +00:00
Kari Oikarinen
0536958614 Provision libusb-1.0 for Linux
It is a dependency of tqtc-boot2qt/qdb, which will join CI soon.

Change-Id: I3b205877e705f554202ab7171f9d828491b95ac6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2016-09-21 09:45:21 +00:00
Liang Qi
891afe7066 Update submodules on '5.7' in qt5
Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-20 20:47:42 +00:00
Qt Submodule Update Bot
2d61b0871d Update submodules on '5.8' in qt5
Change-Id: Ic49edc7055336d6717fdd985798f665db3803384
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-20 20:47:04 +00:00
Qt Submodule Update Bot
6a8a0abf9e Update submodules on '5.6' in qt5
Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-18 09:07:30 +00:00
Konstantin Tokarev
23d1112839 Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-18 05:57:54 +00:00
Konstantin Tokarev
e1bfa77391 Do not use qmake and cmake generator automatically for each conanfile
Keep conanfiles self-contained. "txt" generator is not going to be used
by coin internally, drop it.

Task-number: QTQAINFRA-998
Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-17 11:06:44 +00:00
Konstantin Tokarev
fd6fe04cad Added cmake_installer, imports and explicit library types to conanfiles
Task-number: QTQAINFRA-997
Change-Id: I70b51a47c12928944d9f48be13332fce12296af1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-17 11:06:40 +00:00
Konstantin Tokarev
0958cc4cca Changed BuildinfoDir of conan to use Coin-compatible compiler name
Task-number: QTQAINFRA-998
Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-17 11:06:35 +00:00
Qt Submodule Update Bot
efc461a174 Update submodules on '5.6.2' in qt5
Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-09-16 18:30:36 +00:00
Frederik Gladhorn
b5944e9485 Make sure to install gtk 3 and gstreamer on RHEL 7
Change-Id: I95c570431c5b78e24754b6e08be0172071da3c51
Reviewed-by: Simo Fält <simo.falt@theqtcompany.com>
2016-09-15 09:47:32 +00:00
Qt Submodule Update Bot
387e428e9a Update submodules on '5.8' in qt5
Change-Id: Ibe4e45b892e4e1caae53808b916bc13630ab88f9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-15 09:47:18 +00:00
Oswald Buddenhagen
64cc947ded automatically launch new configure system in top-level builds
this includes moving the -skip option here, where it belongs.
the implementation is a bit hacky, but the proper one would be vastly
more complex: we'd have to load all modules, then parse the command
line properly (the -skip parsing would be a custom callback, to avoid
needing to process features), then discard all now excluded modules
again, then re-process the command line (so we can complain about
options which are now invalid), and only now proceed with the actual
feature processing.
that seems a bit over the top, so we accept that -skip cannot be the
argument of another option, which seems quite reasonable.

Change-Id: I0053658e6d7e11b82cdfe55893cb553b664a9298
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-09-15 06:52:35 +00:00
Konstantin Tokarev
78a764ee65 Install conan dependencies if there is conanfile.txt for module
Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:31:17 +00:00
Konstantin Tokarev
b6414f7d08 Added conanfiles for qtwebkit
Task-number: QTQAINFRA-997
Change-Id: I7aadf3549affeeeb3130d8fdb9ff15242a36aeb9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:31:11 +00:00
Konstantin Tokarev
99ff42545f Install Conan on Win10
QtWebKit will use Conan to install 3rd party dependencies like ICU.

Task-number: QTQAINFRA-997
Change-Id: I4b9bfeb86b28abfdef52afcf249428c3ec41f32a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:31:01 +00:00
Konstantin Tokarev
90f5a25c66 Update Ruby on Win10
QtWebKit requires newer Ruby than version installed on Windows 10 builders.

Task-number: QTQAINFRA-997
Change-Id: Id4f917a824daaab4aeb1445a3a16906663208b6d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-14 22:30:52 +00:00
Qt Submodule Update Bot
8cdb619bce Update submodules on '5.6' in qt5
Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-09-13 18:02:05 +00:00
Eskil Abrahamsen Blomfeldt
25b385764e Add Qt Android Extras as dependency for Qt Purchasing
Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-09-13 10:28:43 +00:00
Liang Qi
3e5229c689 Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I62235fec5e9b8b81e41d64bfcf58067dc1213d0c
2016-09-13 12:14:43 +02:00
Liang Qi
4477c49291 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/android_sdk_linux.sh

Change-Id: Ib972234bb644353db6920b2dcbe1fd4775ef1779
2016-09-12 15:09:56 +02:00
Heikki Halmet
f1de674fd9 Android sdk and ndk to provisioning for qt5.6
Install latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.
Build-tools version 23.0.3 is the latest usable version
for Red Hat 6. Newer version of build-tools, version 24.x.x,
requires GLIBC_2.14, which is not available in Red Hat 6.

Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-12 09:47:22 +00:00
Qt Submodule Update Bot
1c06b83ff0 Update submodules on '5.8' in qt5
Change-Id: I4bd1038cd3ee8cefcfb27179527511c41a0af799
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-08 04:27:50 +00:00
Qt Submodule Update Bot
33feec0dc8 Update submodules on '5.7' in qt5
Change-Id: Ic053fa3b81c674e4a63419bdab848e362b2a93a6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-07 04:20:09 +00:00
Qt Submodule Update Bot
2fb27862aa Update submodules on 'dev' in qt5
Change-Id: I4e7a32798c5b37f63776f8c8ee5e21e9d198895f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-06 17:14:38 +00:00
Qt Submodule Update Bot
25ee5c337c Update submodules on '5.6' in qt5
Change-Id: I1f0e77afca353b07420ed8da001cfbbaaa738dce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-06 05:13:43 +00:00
Qt Submodule Update Bot
4faee20713 Update submodules on '5.6.2' in qt5
Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-09-05 16:47:08 +00:00
Qt Submodule Update Bot
72c617cf91 Update submodules on '5.8' in qt5
Change-Id: Ic507adbb59d9a95afa4c188223f8e0a5d2d5d03c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-05 04:38:30 +00:00
Qt Submodule Update Bot
cb6b46a516 Update submodules on '5.6' in qt5
Change-Id: I34bab96a9ec73aa07e1295250aa85528f306a679
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-09-04 15:16:38 +00:00
Qt Submodule Update Bot
64f62b4b95 Update submodules on '5.7' in qt5
Change-Id: I8309b4fd697efb7b539c84d0c351b25c230a4950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-09-03 23:30:51 +00:00
Qt Submodule Update Bot
68a5a649ab Update submodules on '5.6' in qt5
Change-Id: I565078e5d2d1d8b6a9111d3f063eaebafe008c6f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-09-02 18:06:20 +00:00
Qt Submodule Update Bot
5b7def1433 Update submodules on '5.8' in qt5
Change-Id: I457d16bb5c82d98dfc0995e84c08fee89d872e89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-09-01 03:23:21 +00:00
Qt Submodule Update Bot
66ffe13b50 Update submodules on '5.6' in qt5
Change-Id: I45ed20f8f12335ac2d7aa315329a25c8fbac94fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-30 04:00:57 +00:00
Qt Submodule Update Bot
70361aac02 Update submodules on '5.8' in qt5
Change-Id: I165c8b4ae2709d009462b7fa5b91561759524e5f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-08-29 04:29:14 +00:00
Qt Submodule Update Bot
85771ddaaa Update submodules on '5.8' in qt5
Change-Id: I558721d2b7a630453ce794e7b7b97e1fca5ef3dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-08-28 17:43:30 +00:00
Simon Hausmann
31d8277404 Remove qtsystems from the list of recommended modules in qtlocation
QtSystems is not a supported module at the moment, and the code in
QtLocation to utilize QtSystems is behind an #ifdef and destined for
removal.

Change-Id: Ide44f138638ccd751044c13c289f1e116641a23e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2016-08-28 17:43:26 +00:00
Qt Submodule Update Bot
42ed864856 Update submodules on '5.7' in qt5
Change-Id: I726579f7e3e25774dc882c1c9d4780ccf23deaed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-26 19:04:36 +00:00
Qt Submodule Update Bot
7831d61e82 Update submodules on '5.8' in qt5
Change-Id: I188c217abff06c901f6da7561bc7ed1f3c12d8b1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-08-24 18:02:48 +00:00
Jani Heikkinen
56fc6bc77b Removed TP status from qtscxml and qtserialbus
Change-Id: I8ed4edcdf9eab48ec1ac278d3e8de38149b0fd8d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-08-24 18:02:44 +00:00
Oswald Buddenhagen
71524c78f6 Merge remote-tracking branch 'origin/dev' into 5.8
Note that this also contains the adjustment of the branch for the
latecomers qtspeech and qtnetworkauth.

Change-Id: Ia77eb4d47a6ad66cb35e50ae03af751f46a805a8
2016-08-24 19:54:10 +02:00
Oswald Buddenhagen
9584900b5c Adjust submodule branches
Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f
2016-08-24 11:52:19 +02:00
Qt Submodule Update Bot
2dcb31a181 Update submodules on '5.6' in qt5
Change-Id: I1104beac8bafb324731879efdb752a1cebbb9512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-22 16:37:59 +00:00
Jesus Fernandez
b78f3579af Add qtnetworkauth
Change-Id: I4cd81725d0aec29ff3252a84504a81a44d1b60eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-08-22 09:03:20 +00:00
Oswald Buddenhagen
6cfd3a2118 fix branches of qtpim and qtsystems
these repos were definitely _not_ branched for 5.7.

Change-Id: Ib31d4e07f2651cfba0a7d31a9db1f1a812061313
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-18 04:29:08 +00:00
Qt Submodule Update Bot
af364a39aa Update submodules on '5.7' in qt5
Change-Id: I8b849ebf5685a65206d1c60d1c3f7b85e3e6716d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-18 04:28:57 +00:00
Frederik Gladhorn
80ee813a03 Make QtSpeech a tech preview release for Qt 5.8
Change-Id: I144109a45bece4b2283c24ad7aae64c098f86963
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2016-08-17 08:37:40 +00:00
Qt Submodule Update Bot
9410b99b16 Update submodules on 'dev' in qt5
Change-Id: Ie425f3f5a64e83702a6987d2892fbfa68bea5844
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-17 07:26:42 +00:00
Qt Submodule Update Bot
2556777f36 Update submodules on '5.6' in qt5
Change-Id: I3fbdb4edc4d37a8b25fdaff52853d672c951891d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-16 11:53:15 +00:00
Qt Submodule Update Bot
2ed6386fe3 Update submodules on '5.6' in qt5
Change-Id: I4821c386e318139e13ad228983c43c1b1d978494
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-13 10:06:10 +00:00
Qt Submodule Update Bot
40e137cbee Update submodules on '5.7' in qt5
Change-Id: I5494d36a2b93a85acbc5825f5bd73d032a4098a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-11 23:30:46 +00:00
Qt Submodule Update Bot
b0bfbf3bf0 Update submodules on '5.6' in qt5
Change-Id: I166e0f9a092f7e293d50d7efb12df54bcee5ec13
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-10 12:05:33 +00:00
Oswald Buddenhagen
7efeb26af7 Adjust submodule branches
Change-Id: I6e8c8e91b7e17efa93b24e8026fa3f340bd10e9d
2016-08-08 11:06:22 +02:00
Qt Submodule Update Bot
5c5e807018 Update submodules on '5.7' in qt5
Change-Id: I0f7724142af344e35897035016b03ce046c8164e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-07 23:30:49 +00:00
Qt Submodule Update Bot
fc1d30a447 Update submodules on '5.7' in qt5
Change-Id: I59475dd0549f9c4c83ad830a76b3b5225aa90eda
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-06 23:30:51 +00:00
Qt Submodule Update Bot
acafa69d57 Update submodules on '5.7' in qt5
Change-Id: I92e5272d0d0662bfed36e2fa51d25b729e89a172
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-06 10:01:05 +00:00
Liang Qi
23f5d41bec Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I91cf0b6132a73c34c63d83a0bee1c028f2f819f8
2016-08-06 06:20:21 +02:00
Qt Submodule Update Bot
525a85bd6d Update submodules on 'dev' in qt5
Change-Id: I5c05b788003c8c274914ad5533d1eb7971c6e823
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-05 18:20:17 +00:00
Liang Qi
95ff2f4870 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I1a08537bcd4748ebbb3e5a670e3a099779f33945
2016-08-05 09:04:05 +02:00
Qt Submodule Update Bot
b385314451 Update submodules on '5.7' in qt5
Change-Id: I203ab93ecfa295c0a8051b85855333e5a92030c8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-05 05:49:36 +00:00
Qt Submodule Update Bot
3fb555a773 Update submodules on '5.6' in qt5
Change-Id: I32152358542e406f773d106abba25ee5609c6469
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-04 22:00:58 +00:00
Tony Sarajärvi
19b472f1ff Fix Coin provisioning in RHEL 6 regarding sslclientkey values
There was a bug in RHELs subscription manager that caused yum
not to work by fetching incorrect data into the sslclientkey repository
parameter value.
This provisioning script fetches new data for the repository and thus
fixes yum. Naturally by not having a template where a bad repository
exists, this script would be obsolete. Also, as this needs to be run
before any other scripts using yum, prefixes were added to the scripts.

Change-Id: I5c6ed1d43451d2918f9b6dad22b0106339f36aea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-08-03 10:28:52 +00:00
Qt Submodule Update Bot
67754033cf Update submodules on '5.7' in qt5
Change-Id: I03f7c07e68856947471fe9976ff996b680c9fabf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-08-03 01:55:05 +00:00
Qt Submodule Update Bot
6fe0028baa Update submodules on '5.7' in qt5
Change-Id: I65292231de671b660f232f0ccac7aeb4ae700f59
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-08-02 05:34:43 +00:00
Qt Submodule Update Bot
8a8134e878 Update submodules on '5.6' in qt5
Change-Id: Ie6bd9ea82d5e67fee7645dccd9b07ceac5755582
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-07-30 07:16:36 +00:00
Qt Submodule Update Bot
447361eb68 Updated submodules
Change-Id: Id18ec0d487df664c69aff8a8fe8a2ceff64ab42d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-19 10:42:19 +00:00
Qt Submodule Update Bot
d5e52dbe26 Updated submodules
Change-Id: I4e1ec0bbeccad560b49b39b4280950684209445d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-15 08:17:10 +00:00
Qt Submodule Update Bot
ddae625e19 Updated submodules
Change-Id: If0b6c9e8ddac98085848e44d84ad26e9cc403043
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-14 11:17:44 +00:00
Qt Submodule Update Bot
a4280c4f44 Updated submodules
Change-Id: If321cd042d8edc2a0532352d2c994e1c2614c9a0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-12 11:40:31 +00:00
Qt Submodule Update Bot
24961e9f2c Updated submodules
Change-Id: Ia252cef752425c836304bd94fd00de3532b79813
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-06 08:53:10 +00:00
Qt Submodule Update Bot
1240baedcc Updated submodules
Change-Id: Idf41e8902a32fd125c7c88c99e052aef7a2a703e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-05 10:46:44 +00:00
Qt Submodule Update Bot
6fbf179f73 Updated submodules
Change-Id: Ia80e4d39f9772e32952685008380cc348f481c6c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-04 22:00:50 +00:00
Qt Submodule Update Bot
e00d0be179 Updated submodules
Change-Id: I5443b0f4d97cfc076e3a642ae78770b38661e983
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-04 13:30:37 +00:00
Kai Koehne
8ccf739ae0 README: Update Windows build requirements
Change-Id: I9e29d0728db35f65822aff9d709cd93a6b3b7ab2
Task-number: QTBUG-54084
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-04 07:39:52 +00:00
Kai Koehne
828c7e9e4e README: Qt 5.7 requires C++11 compliant compiler
Task-number: QTBUG-54084
Change-Id: I127fe637791f05f8310988a4c09fc9584e194f53
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-07-04 07:39:50 +00:00
Qt Submodule Update Bot
acf5c9d0ff Updated submodules
Change-Id: Ie27b2f6daddc68e72b09d779beaf1f61a8a29aa6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-07-02 20:55:05 +00:00
Qt Submodule Update Bot
d445febd14 Updated submodules
Change-Id: I48fca93fd045323752c79abd2710e9307ea85b3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-07-01 10:35:37 +00:00
Qt Submodule Update Bot
f7ef3ff7f0 Updated submodules
Change-Id: Ib7650cfe43602d9337ed7892af9a6649a6dd2f6f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-07-01 09:31:12 +00:00
Qt Submodule Update Bot
ca7708f22e Updated submodules
Change-Id: I64b5898838652d6a785a45136947f7d55fa3d3f1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-06-30 07:46:13 +00:00
Qt Submodule Update Bot
9c2315789d Updated submodules
Change-Id: I23f310f80837c73fee1fff2618e1253c6b80b74b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-30 05:12:12 +00:00
Qt Submodule Update Bot
7b77cbc4df Updated submodules.
Change-Id: I5a2524a408eaf6f808c0e1242583e83bf01b42b0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-29 11:59:46 +00:00
Frederik Gladhorn
f4c6a9c97c Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev 2016-06-28 15:58:17 +00:00
Qt Submodule Update Bot
f78835e062 Updated submodules.
Change-Id: I12a0a7f2f8174541a1d3c572478c3d0fb765a35d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-06-28 15:58:12 +00:00
Qt Submodule Update Bot
388494d7ee Updated submodules.
Change-Id: I5a780a47ccfcea17e64eda0ed922ca57079ea0ea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-25 02:39:35 +00:00
Liang Qi
39a03d3d6a Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
2016-06-24 07:10:02 +02:00
Qt Submodule Update Bot
3727ce11ac Updated submodules.
Change-Id: Icb8aad2382e3106db016485d404d7e8afc987399
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-06-23 20:08:48 +00:00
Qt Submodule Update Bot
fdbccea88a Updated submodules.
Change-Id: I67cbc0f3327aeaf3c84e2eb52432a362f0e7c64a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-06-23 12:34:18 +00:00
Qt Submodule Update Bot
e06238e996 Updated submodules.
Change-Id: I5a29cb5e04135debd8e7293594eb540e6acd23dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-21 14:08:07 +00:00
Liang Qi
e205785b5c Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca
2016-06-20 21:35:34 +02:00
Sze Howe Koh
49f1a7f0a6 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"
See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771

Change-Id: Iebda5d9a886f4c0f16fe4906cf6dc4c81f2c3c90
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2016-06-20 16:35:21 +00:00
Qt Submodule Update Bot
0b10bd3657 Updated submodules.
Change-Id: Ia5d6e51574251dbd0e9f9cf3f41aac2de56471c4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-20 16:35:18 +00:00
Qt Submodule Update Bot
02df76bf07 Updated submodules.
Change-Id: I3d25d26bebe88a542f794c29bcda413302432874
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-18 15:25:48 +00:00
Qt Submodule Update Bot
6bed56a680 Updated submodules.
Change-Id: I86dfc95bd06101ed826d139fd577ccfa662ad0b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-17 13:52:32 +00:00
Frederik Gladhorn
0536b1e9e4 Clean up Windows provisioning scripts
The execution policy is set by the CI. The command usually fails as it
is in the scritps right now since it must be run as admin.

Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-06-16 10:15:18 +00:00
Frederik Gladhorn
8ddc3c1254 Add script to patch QNX SDK headers for Qt atomics
Applies http://www.qnx.com/download/feature.html?programid=27555
to the QNX SDK on our continuous integration machines.

Change-Id: I6d24b5024b3e5981c30bbf9a26a1bb4dfaca4e80
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-06-16 08:40:11 +00:00
Qt Submodule Update Bot
b3bc77fc73 Updated submodules.
Change-Id: Ia573d0de926441bc63b4c3871e075eb342e294c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-16 04:26:54 +00:00
Liang Qi
bbe0a01fde Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4
2016-06-14 20:25:20 +02:00
Kai Koehne
9b6d296096 README: Do not take deprecated modules as an example
Task-number: QTBUG-54084
Change-Id: I03c81822a05fb9a3bda975421228b460c2a00fe2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-06-14 16:20:56 +00:00
Kai Koehne
5778d17a68 README: Remove platform specific build requirements
The list is not up to date (e.g. ICU is not required on Windows anymore),
and woefully incomplete. Better just link to the wiki/documentation.

Task-number: QTBUG-54084
Change-Id: I6b22fc1c84d40b892503085cb023a7db25fd19c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-06-14 16:20:53 +00:00
Qt Submodule Update Bot
70b3b02977 Updated submodules.
Change-Id: I8358eadfea5f3bf8ff8615d3c468201acd58f1b5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-14 16:20:50 +00:00
Qt Submodule Update Bot
451f93e26b Updated submodules.
Change-Id: I5ad7c931f77a167ca4574fd20eb6fe783d95a297
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-12 17:43:06 +00:00
Qt Submodule Update Bot
4f64747383 Updated submodules.
Change-Id: If1195243a052f8cd20079345dbc7b2783e7bf459
Reviewed-by: Liang Qi <liang.qi@qt.io>
2016-06-11 07:42:47 +00:00
Liang Qi
e568a942ec Merge remote-tracking branch 'origin/5.7.0' into 5.7
Conflicts:
	.gitmodules

Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
2016-06-10 12:32:03 +02:00
Qt Submodule Update Bot
6a4d5e4bc8 Updated submodules.
Change-Id: Ia6457dbccce18d960274b0a1774c3d646dfbc6b9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-06-07 17:59:57 +00:00
Qt Submodule Update Bot
51cf8dcf3b Updated submodules.
Change-Id: Iec9d13ae71c8660baec5ca6cfee57aeee3b33922
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-06-05 11:04:42 +00:00
Qt Submodule Update Bot
801066c40d Updated submodules.
Change-Id: If3be9830f7bdbb5508e3b3a962afcc7402b433b2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-06-03 06:24:37 +00:00
Erik Verbruggen
3529d894ba OSX: Switch crash reporting to server mode.
Meaning: to unattended use, so no crash dialogs will pop up. In a later
change we can suppress QTest from generating stack traces when this
setting is *not* in server mode (meaning: the OS will take care of the
stack traces).

Change-Id: Idee9311f866228cd35ecb07889f1c19424981221
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-06-02 14:37:12 +00:00
Jędrzej Nowacki
928c491397 Export CI_JOM_PATH variable on all templates with jom
That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.

Change-Id: I0bc5c76717e994824b85a4353a7218db4b648344
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-05-30 14:08:24 +00:00
Jędrzej Nowacki
a97874523f Export CI_ICU_PATH variables on all windows templates
That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.

Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-05-30 14:08:22 +00:00
Jędrzej Nowacki
2be9656332 Coin provisioning: overwrite files while unzipping
Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-05-30 14:08:20 +00:00
Qt Submodule Update Bot
82873b1b1e Updated submodules.
Change-Id: Iec0cece6ec1ca471593c4acd32595b59dc64a651
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-30 13:30:27 +00:00
Qt Submodule Update Bot
e96f60a228 Updated submodules.
Change-Id: I5093e1ed41b58628b9a67e3bc8c9ed737c9e5523
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-05-30 10:07:21 +00:00
Qt Submodule Update Bot
4e02d96116 Updated submodules.
Change-Id: I89a5dc174641a9e4fc7c99e31794c92575179c49
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-05-30 08:13:51 +00:00
Qt Submodule Update Bot
0c66994ae9 Updated submodules.
Change-Id: Ia44a5bc2e6e42cd00524dc82c01d5f59726475f3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2016-05-28 07:36:05 +00:00
Simon Hausmann
ad474f110f Fix status of qtquick1 and enginio
The right term is "ignore" in order to ignore the module, not "ignored".

Change-Id: Idd4a887834fc98fffb2b9e8385308aa676ba3adf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-05-26 23:13:14 +00:00
Jani Heikkinen
30f22b8351 Set qtquick and enginio to ignored state
It was agreed at the Qt Contributor Summit 2015 that QtQuick1 will be
removed completely from the packages and not even compiled during
qt5.git integration.

Enginio is also removed from 5.7.0 so ignoring it as well

Change-Id: I80ac88d28f811fbf731e33d4d4353a249ad6d29a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-05-24 11:53:12 +00:00
Ilia Kirianovskii
9443890d60 Fix git_install_hooks for relative gitdir
Previously we expected gitdir to be always absolute. This patch fixes
git_install_hooks in case of relative gitdir.

Change-Id: Ia0883af18229703aaa22c62fd2181ed56d9f2fce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-05-24 04:39:24 +00:00
Qt Submodule Update Bot
e50f5b9150 Updated submodules.
Change-Id: I9b4f1c3daedf21ab201027d5793aa162710c84af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-21 06:44:36 +00:00
Qt Submodule Update Bot
4ace6667f2 Updated submodules.
Change-Id: I32a473f951d4c00b98263d570ebadbd368fa78ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2016-05-18 19:18:50 +00:00
Oswald Buddenhagen
23824d231b Adjust submodule branches
Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
2016-05-13 13:28:52 +02:00
Oswald Buddenhagen
777967f97b Merge remote-tracking branch 'origin/5.6' into 5.7
skipped all sha1 updates.

Change-Id: I1f741cf7bea806ab238b4f1b5585bb440dafd4f7
2016-05-13 13:22:16 +02:00
Qt Submodule Update Bot
868e545eb2 Updated submodules.
Change-Id: Iac472068ce186e1e1a0a8a58c7050451171eee37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-11 18:54:26 +00:00
Qt Submodule Update Bot
9812986913 Updated submodules.
Change-Id: I092e0b94eb77397708ab6d196357ec6b3b141326
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-11 13:58:19 +00:00
Qt Submodule Update Bot
c07377e739 Updated submodules.
Change-Id: I5ea896b0ec6b9837fda44eb7b7a61aa3c6e42db5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-09 04:09:45 +00:00
Frederik Gladhorn
cef159accd Add script to install freeopcua on Ubuntu 14.04
Change-Id: Ia13362cf9aa17fbc0e85ac61b1f2897101903aaf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-06 10:43:53 +00:00
Oswald Buddenhagen
a1ec8795c6 make it actually possible to specify 'ignore' as a class
another thing the doc claims to be possible - also quite reasonably.

Change-Id: I2220245b10f02a778345b6549e345b2486630ffd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-05 20:02:39 +00:00
Oswald Buddenhagen
c41d854254 make it actually possible to exclude classes
the doc - quite reasonably - claims that it is possible.

Change-Id: I4668b3feafe721f1db4deb65848206d8197962c8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-05-05 20:02:38 +00:00
Qt Submodule Update Bot
9b9801b7d4 Updated submodules.
Change-Id: I6230a59c886114184d74ad34651f04f0d296ade0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-05-05 05:40:27 +00:00
Frederik Gladhorn
3afd172a25 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If598cf5987b52450a43fab93702b717c96b17ad2
2016-04-28 12:25:11 +02:00
Jędrzej Nowacki
3963056f63 Add script that install icu on RHEL 6.6
That is translation from coin-setup golang code to sh script

Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2016-04-28 07:54:50 +00:00
Frederik Gladhorn
54f1bfd10c Add script to install jom through powershell
Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-04-28 07:54:48 +00:00
Frederik Gladhorn
2aff311423 Add coin provisioning directory
Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-04-26 15:50:53 +00:00
Qt Submodule Update Bot
d61ac6c2f0 Updated submodules.
Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-04-25 08:15:10 +00:00
Qt Submodule Update Bot
b7c2e9a846 Updated submodules.
Change-Id: Id24e1017eee9828e7d6245f1241f241662cc48ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-04-21 05:55:42 +00:00
Iikka Eklund
3df0a5837c Update qtquickcontrols2 status as "addon" for Qt 5.7
qtquickcontrols2 is not in preview state anymore for Qt 5.7.

Change-Id: Ib9d3616e7605beabb9bb9f0b0cb1b79a8d499ebd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-04-21 05:55:37 +00:00
Qt Submodule Update Bot
499c5390b3 Updated submodules.
Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-04-21 04:26:15 +00:00
Dominik Holland
a9752d68ed Added qtdeclarative and qtmultimedia as optional dependencies for qtspeech
Change-Id: I20602133a2156b162e99432f868e4925469c7ff5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2016-04-13 14:00:38 +00:00
Qt Submodule Update Bot
e23b244494 Updated submodules.
Change-Id: I875e16060956af433e20acff4fbdcfb54d0d9923
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2016-04-13 14:00:35 +00:00
Qt Submodule Update Bot
273e5b82cf Updated submodules.
Change-Id: Idc9529f02cc9a5ad4cd300a745b559fea9c94ed4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-04-11 06:57:46 +00:00
Jani Heikkinen
7251401281 Update 5.7 module status
In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore

Change-Id: I019f76162cfcc853b542695245a983f151f1b072
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2016-04-11 06:57:42 +00:00
Liang Qi
5758a88e59 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	.gitmodules

Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
2016-04-05 09:52:18 +02:00
Qt Submodule Update Bot
e80d89059c Updated submodules.
Change-Id: I983429d487f7667c36553d24037639abee660b42
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-04-04 13:21:35 +00:00
Qt Submodule Update Bot
a550ad21bf Updated submodules.
Change-Id: I1c0bcd2c582276c04e44e88169807cc7cf5b43c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-04-04 07:23:53 +00:00
Liang Qi
c80e96bb09 Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
	.gitmodules

Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
2016-03-31 09:53:10 +02:00
Qt Submodule Update Bot
f05fece2f7 Updated submodules.
Change-Id: I85bb46a7180a32c1808574d0a54c51703d4cee12
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-29 10:38:52 +00:00
Qt Submodule Update Bot
d9beab9abd Updated submodules.
Change-Id: Ie0c625f6a48fe8d05150bd12f4d92beb2a359ec7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-29 04:19:17 +00:00
Qt Submodule Update Bot
20dcf55e7d Updated submodules.
Change-Id: I5622046dbc1f8eee0cda929627fb8873d525b02a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-08 18:24:09 +00:00
Iikka Eklund
84a1676ed6 Update .gitmodules for automated release src package creation
Introduce new "deprecated" value for status attribute.

We have two flavors of big source packages we need to produce:

qt-everywhere-* which needs to include:

 - essential
 - addon
 - preview
 - deprecated (e.g. qtscript and qtenginio for Qt5.6 release)

Installer only specific source package:

 - essential
 - addon

 The rest (deprecated, preview, ...) need to be shown as split src
 packages in the installer.

The above leads to the following changes:

qtscript: addon -> deprecated

 Needs to be part of big src packages but excluded from installer
 specific big source package.

qtenginio: obsolete -> deprecated

 We can't exclude this module from qt-everywhere src packages.

qtwayland: preview -> addon

 Needs to be part of installer specific big src package and the
 module status is not preview anymore.

Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-08 17:54:29 +00:00
Qt Submodule Update Bot
5e15831271 Updated submodules.
Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-03-04 04:26:10 +00:00
Qt Submodule Update Bot
53b920dc69 Updated submodules.
Change-Id: I94c3646dc3309f71f577c6f41241cb2570d0c598
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-03-03 10:05:02 +00:00
Qt Submodule Update Bot
d74af1270a Updated submodules.
Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-03 00:11:54 +00:00
BogDan Vatra
534d63e652 QQC2 doesn't depend on QQC1
QQC2 depends on qtgraphicaleffects.

Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-02-28 06:41:54 +00:00
Qt Submodule Update Bot
e6076450e1 Updated submodules.
Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-27 20:21:00 +00:00
Qt Submodule Update Bot
e785abbec1 Updated submodules.
Change-Id: Id60487a24eb193207d4d8837a91cef1abc19f97f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-25 18:49:52 +00:00
Qt Submodule Update Bot
211080722e Updated submodules.
Change-Id: I633ba6875269578aae2f9d28062d3fa78924a5fc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-24 15:41:25 +00:00
Simon Hausmann
30236c3f15 Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7 2016-02-24 15:41:16 +00:00
BogDan Vatra
18e84e7c06 Enable QtGamepad usage in Qt3D
If Qt3D finds QtGamepad, it will use it to build gamepad support.

Change-Id: Ifbc40e5e04a6030d25c2d429878d4fb3a3dd11a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2016-02-22 12:40:29 +00:00
Simon Hausmann
d4bb786963 Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
2016-02-19 09:21:52 +01:00
Qt Submodule Update Bot
fb1345171a Updated submodules.
Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-19 05:24:28 +00:00
Oswald Buddenhagen
fdf1b3cc8d rework hook installation
the primary purpose of this change is making it work with new-style
submodules (1.7+) and git-worktree (2.5+). this means resolving '.git'
and 'commondir' files.

we avoid calling git commands, because a) it's slow on windows, b) some
of them are unavailable in older git versions and it's tedious to deal
with that and c) their output is not necessarily optimal (not always
absolute paths).

we also don't use relative paths for the hook locations any more, as
that's too tedious to deal with.

Change-Id: Ie341e748e56d6bef40856e4a49ac368850028d83
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-17 20:18:48 +00:00
Qt Submodule Update Bot
c2549708e5 Updated submodules.
Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-17 20:18:34 +00:00
Qt Submodule Update Bot
6bdec75429 Updated submodules.
Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-16 12:15:51 +00:00
Qt Submodule Update Bot
6efabf6dfe Updated submodules.
Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2016-02-15 10:26:46 +00:00
Qt Submodule Update Bot
3fa8726fa7 Updated submodules.
Change-Id: I5861620b6214dc5ff124672ce21dd4dd5b25ce85
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-15 06:57:00 +00:00
Oswald Buddenhagen
81523d838c Adjust submodule branches
Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430
2016-02-12 17:40:00 +01:00
Qt Submodule Update Bot
7a8c874231 Updated submodules.
Change-Id: I6901259b7a01e57d0c8ca2a9f40d9501635f5cc0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-12 11:11:07 +00:00
Simon Hausmann
e52c7efa4c Fix datavis3d dependencies
The qtmultimedia dependency was missing for datavis3d.

Change-Id: I91007c210e58aa9985844a8234781356391bfbad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
2016-02-12 11:11:01 +00:00
Oswald Buddenhagen
c6d04d68bd add qtgamepad, qtscxml, and qtspeech
Change-Id: I14bc475d44367a9102e896976eba5bd191ee232d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-12 11:10:57 +00:00
Oswald Buddenhagen
4007fc7a26 Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
	.gitmodules

Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
2016-02-12 11:18:27 +01:00
Qt Submodule Update Bot
37c75a23e8 Updated submodules.
Change-Id: I8740e98ba27c1f554366a5183c6972207f0b0061
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2016-02-10 23:22:34 +00:00
Oswald Buddenhagen
3cfe8712ae fix branches of some modules
all repos which are released (whichever way) need release branches.
and vice versa.
also, it needs to be the *right* release branch.

Task-number: QTBUG-50695
Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-07 09:10:14 +00:00
Qt Submodule Update Bot
b680c074d1 Updated submodules.
Change-Id: Ic407bd126cc4c0a557ec7769d41394aa68c0cbee
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-02-07 09:09:35 +00:00
Oswald Buddenhagen
d1d52b5c1e properly complain about invalid entries in --module-subset
Change-Id: I13ec7a6acdc8a47efea14bfabf0413d8a3570870
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-07 09:09:30 +00:00
Oswald Buddenhagen
3de19487d9 replace 'initrepo' with more fine-grained 'status'
instead of a simple bool, we now have five states: preview, active,
addon, obsolete, and ignore (the default). the default includes the
first three.

the CI system is expected to use --module-subset=all,-ignore to include
everything that is expected to build (in some configurations).

Change-Id: Ifb43412054a8e42db0425f24f8e53acfce363caa
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-02-07 09:09:27 +00:00
Miikka Heikkinen
2c53e3d08c Add charts, data visualization and virtual keyboard modules
Change-Id: I53cbc4ce3c2e44687ce454498f5def820614db85
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-25 14:41:07 +00:00
Oswald Buddenhagen
f5ba19c3f0 Adjust submodule branches
Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048
2016-01-25 11:38:54 +01:00
Qt Submodule Update Bot
b93073ecc9 Updated submodules.
Change-Id: I790e982492004e93953bed503a1d777d27c28b6f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-23 11:12:30 +00:00
Qt Submodule Update Bot
1fcdb6cafc Updated submodules.
Change-Id: I88b34da37a589451ae32c6f736f4dc863715b339
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-22 19:11:52 +00:00
Simon Hausmann
d758a3b055 Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
2016-01-22 10:42:38 +01:00
Qt Submodule Update Bot
273821d69c Updated submodules.
Change-Id: I2c671f50d878e8ed03418c2a59c8c997ed3bd6f4
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-22 04:26:30 +00:00
Oswald Buddenhagen
06c3d40cc9 move module dependencies from qt.pro to .gitmodules
this removes the last redundant module list.

the module build order which is not determined by dependencies is pretty
random now. this is avoided for a few heavy and "less relevant" modules
by setting a priority to built them as late as possible.

Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-22 04:26:12 +00:00
Qt Submodule Update Bot
f47e82703c Updated submodules.
Change-Id: Ie0cf0058a5e8f383be4608a5c094b610b9a575af
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-19 19:11:07 +00:00
Qt Submodule Update Bot
bb9eebce48 Updated submodules.
Change-Id: Ia4dbb4d02b5c32c76cd9cbdc320709af668dc4bc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-18 19:58:29 +00:00
Qt Submodule Update Bot
0e2ec253d8 Updated submodules.
Change-Id: I3ce0cb4e9ea44dcd860b48d3a6ecaad0eb31964f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-01-17 17:40:06 +00:00
Qt Submodule Update Bot
63d305bb7d Updated submodules.
Change-Id: Iff91870d954d24d2649334d2eeb8357e483009b3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-01-12 19:50:06 +00:00
Qt Submodule Update Bot
bcebc106f1 Updated submodules.
Change-Id: Ibacf35a5fb113f9b54a96c10d52aa70e2e64f8da
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2016-01-05 12:50:44 +00:00
Oswald Buddenhagen
2e134da46c don't use POD, to restore msysgit perl compatibility
Change-Id: I360a6d5246e33dcf3f72bc83f2790905af8c1463
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-25 08:07:16 +00:00
Oswald Buddenhagen
c3e404fffd don't use GetOptionsFromArray, to restore msysgit perl compatibility
Change-Id: Ic02a5d8b5a8a813a23bed1c0b45bcb8ee47e3edb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-25 08:07:10 +00:00
Oswald Buddenhagen
43135d6e33 make qtandroidextras a regular optional dependency of qtconnectivity
we want to move to a purely declarative way to declare submodules, so
the conditional has to go.

instead, use an optional dependency to ensure build order, while the
module excludes itself via requires() if its dependency is missing.

Change-Id: I615382700ff601c9ab003d131b2cc600441c514c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2015-12-25 08:07:00 +00:00
Qt Submodule Update Bot
cda5de797b Updated submodules.
Change-Id: Icf4a1303edde9048adcb9bb40ced1b503a170f22
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-24 18:06:50 +00:00
Simon Hausmann
d2b26ede9c Updated submodules.
Change-Id: I5d7279982a017ef903991faa89c79ca10e717497
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-17 21:01:44 +00:00
Simon Hausmann
90b08b1c6d Updated submodules.
Change-Id: I701ce99cb7eb7fa8daffa67699920f51a7ab2087
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-17 06:52:41 +00:00
Liang Qi
2051c2987e Enable qtpurchasing by default
Change-Id: I4030b9f446a865e758492e2f07b8adb19052e91d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-12-16 20:08:35 +00:00
Simon Hausmann
f8ae5ee3b6 Updated submodules.
Change-Id: I806a9fb4b31adf8c02e00c2320d53f7d7fe3669e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-16 09:49:14 +00:00
Liang Qi
c485f3e4a7 Manually update qtpurchasing
Change-Id: I7385116d7c6e9a7f9b7b2be4b76468b8459299dd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-16 09:38:11 +00:00
Liang Qi
7b30d85bdc Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ibd5caf0448c9eba9251bc9395fe647f1955743f0
2015-12-15 19:05:02 +01:00
Liang Qi
e4ff528bb6 Updated submodules.
Change-Id: I54527e1c5ad138ac63d38d8eabcf158d11b0286d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-12-15 12:13:58 +00:00
Simon Hausmann
a93760f957 Updated submodules.
Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-15 07:35:22 +00:00
Simon Hausmann
d678e02936 Updated submodules.
Change-Id: Ia00cca2d8c22ff96a4f871d70eaa9eb55f6391b0
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-10 05:05:50 +00:00
Antti Kokko
1c04b1f7bd Updated submodules.
Change-Id: Ic83700e48f40b0ee8e76f4b4e44b28b4c85bebb7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-08 04:54:41 +00:00
Oswald Buddenhagen
2a46300588 error-check dependency declarations
Change-Id: I98ad68d8be608b144c5f2ff422aaf7baab9907e8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-12-01 14:00:46 +00:00
Antti Kokko
d527415ac6 Updated submodules.
Change-Id: Id124a31338548d9a76baa908b281b3bb6ede168a
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2015-12-01 14:00:43 +00:00
Frederik Gladhorn
f128a9a7e1 Updated submodules.
Change-Id: Id3463e24f1aecc6e2d4d040bc7878ad1d48f6327
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-11-16 05:29:51 +00:00
Oswald Buddenhagen
83b45e9030 declare mandatory dep serialbus => serialport
Change-Id: I35c5f18b7c8856071413e50590308f402be7e528
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2015-11-13 09:22:22 +00:00
Jędrzej Nowacki
1197dbb1db Updated submodules.
Change-Id: I8e348f3cab39f75acb68b2bdc388cd37927424bb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-11-12 19:05:33 +00:00
Frederik Gladhorn
d55a9e3a66 Updated submodules.
Change-Id: I0793599392d2e64ceabe8d0f24ba7cb0abc76b84
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-11-07 14:00:12 +00:00
Jani Heikkinen
4aabf3e19d Updated submodules.
Change-Id: I4f71eed2d556219480490f433323db4c151b4ba7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-10-31 09:29:59 +00:00
Fredrik Orderud
ddcc9b234e Update Qt3d manually
Fixes a crash at destruction.

Change-Id: Ie773b3def96cc1e55baa36b9ff7cf697770d479e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2015-10-28 20:25:26 +00:00
Simon Hausmann
95a89a8b5a Manual update of qtmultimedia
In order to bring in the missing libs for QTBUG-48914

Change-Id: I678dcd1ca5bdae66efdd09b809ff63c7da37d58a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-27 12:15:41 +00:00
Fredrik Orderud
98717e27d0 Update Qt3d manually
Fixes some nasty threading problems related to pick event race
conditions and QThreadPool thread recycling.

Change-Id: I977ad310d1a767abc0fbcca49f9088ff5fdda708
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-26 18:22:04 +00:00
Simon Hausmann
5197447fd0 Update WebEngine manually
This brings in MSVC 2015 fixes and RHEL/OpenSuSE build fixes

Change-Id: I796c153a005e964c4a32203cfe08cbf3ece5f39e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-23 18:46:03 +00:00
Laszlo Agocs
a0309a7a43 Fix dependency order for qtlocation and qtwebview
Change-Id: Ie61b69be3b38975675fff3553d1f5c9510e7865e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-10-22 05:00:55 +00:00
Simon Hausmann
17c6369c9e Updated submodules.
Change-Id: I3094692e61e5a41116d69053d1f296eac46e545b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-22 05:00:52 +00:00
Jani Heikkinen
6f0713adf6 Updated submodules.
Change-Id: Ifc06de16a694d8d24bdea3a81e796a0c460e1864
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-10-12 10:43:55 +00:00
Oswald Buddenhagen
0c4ec778f5 declare qtgraphicaleffects before qtquickcontrols
otherwise the dependency is botched.

amends 30e19df5b.

Change-Id: I8e17d2f91c7c55c49be6239268f928ae4577d17c
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
2015-10-12 05:25:39 +00:00
Iikka Eklund
6382845a6d Update build instructions for commercial licensees
Add build instructions for commercial licensees as well so that the
same README covers both opensource and enterprise users.

This removes the need having separate README file for commercial users.

Change-Id: Ibd3012b428c6fa85f47c1c459d8029ebfce92046
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-10-12 05:25:20 +00:00
Edward Welbourne
383b2585e3 Explain what the canonical URLs are.
This caught me out the first time I tried to use init-repository.
Documentation should work for noobs.

Change-Id: Ia6c9ce395ace034128bfe80f2c31be7f9cd4cf35
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-10-12 05:24:50 +00:00
Laszlo Agocs
ee443af314 Add qtserialport as dependency for qtlocation
Task-number: QTBUG-48082
Change-Id: I7b90777bfdd1286f6340caf756562146772d0bb3
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2015-10-09 12:05:04 +00:00
Jani Heikkinen
d16a8656f9 Updated submodules.
Change-Id: I871b519649bb6130db128d7ae4c0916ee2e48146
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-06 17:21:56 +00:00
Simon Hausmann
c78fc65631 Updated submodules.
Change-Id: Ia0a52a43a8c5fa7516c1469241a449c457153040
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-26 11:22:38 +00:00
Simon Hausmann
ae1dc7aa3e Updated submodules.
Change-Id: Ic5ea73d6ca0ea2e174cd592226a16885a73aeed1
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-25 19:35:21 +00:00
Thiago Macieira
942ae1dd82 Add a way to build just a few of Qt's modules more easily
The current way requires passing -skip to configure, which is a list
of what not to build. To set a list of what to build (e.g., for
testing, in a specialized build, etc.), there was no way. Now you can
just do:

    qmake "QT_BUILD_MODULES=qtbase qtdeclarative qtsvg qtxmlpatterns"

(the order doesn't matter)

Change-Id: Ifcaefa35b16b137866ca839a483ce366e35de7ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-09-24 05:22:45 +00:00
Frederik Gladhorn
d7f477d1cd Add qtpurchasing as non-default module
For 5.6 this is a tech preview, it will be added properly in 5.7.

Change-Id: I709830fbcfc439d5446718093f0c16ad2dcb1e57
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-09-24 05:22:42 +00:00
Simon Hausmann
c42dd3462b Updated submodules.
Change-Id: If0045fccac1af79e858831c75c7808fe6997e37e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-09-22 16:40:33 +00:00
Qt Submodule Update Bot
a2a6cf11a7 Updated submodules.
Change-Id: I1d3966833b5f27fb262f2d3727557ef2c8947828
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-09-21 18:02:48 +00:00
Jani Heikkinen
944aa6bcbb Updated submodules.
Change-Id: I3c4cdbef3f8fbc016757fdd6a4b5bb8eb6a644df
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-21 13:24:01 +00:00
Oswald Buddenhagen
2068af50ca Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	.gitmodules
	qtquickcontrols2
	qtwebview

Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
2015-09-18 12:00:07 +02:00
Simon Hausmann
a89c6ef703 Manual update of qttools to remove webkit dependency
Change-Id: I6cf6ae75cedb0945c46fd9b3fa63bd21a9ce4806
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-18 06:33:36 +00:00
Simon Hausmann
2ebfdb4ca8 Updated submodules.
Change-Id: I03bbaedeb88ad76df39ce10f6828ebf5c8b8dadf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-17 11:37:09 +00:00
Oswald Buddenhagen
9bde440225 Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: I7a28bcaeb5538763274fdef20f8c8ca81b9b21ad
2015-09-10 14:24:15 +02:00
Qt Submodule Update Bot
dd1aeea722 Updated submodules.
Change-Id: I0ba6e6ce435be779865b0ace08d74dd29800be9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-04 04:24:15 +00:00
Frederik Gladhorn
e734941df8 Add QtQuickControls2 as submodule
Change-Id: I435fb765b48a978763384226e399b33448a40502
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-09-03 22:45:29 +00:00
Alex Blasche
c5cb9d2d89 Hook qtserialbus into qt5.git
Change-Id: I17c8c55205f852b3e79f279cad7b87f403d7fbe7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-03 17:40:25 +00:00
Frederik Gladhorn
4c520caa69 Add qtwebview as submodule
Change-Id: I6a69b08945767f4cb8f4164630c726cf8bf552bb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
2015-09-03 17:40:17 +00:00
Jani Heikkinen
4116ec2474 Removed QtWebkit and QtWebkit-Examples from qt5.git
QtWebkit (and QtWebkit-Examples) were deprecated in Qt 5.5 and will now
be removed from qt5.git in Qt5.6 release

Change-Id: I86e1072141956136fa5e4220cdcdf812492453b3
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-09-03 17:40:10 +00:00
Simon Hausmann
3e1fd2cb31 Fix QtEnginio branch
The 1.3 branch does not exist anymore, let's use 5.6

Change-Id: I442ad45c73a0e08c853385c999dddf818447bb82
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-03 17:40:03 +00:00
Simon Hausmann
1a46c456eb Updated submodules.
Change-Id: Ie8c296b8e64fe0083ab5ec1584a42c7165fbe3ab
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-09-03 17:39:54 +00:00
Andrew Knight
7bbe464617 gnuwin32: remove win_bison/win_flex
These tools are copies of bison/flex and are no longer needed.

Change-Id: Ia543926ee8126358beee2aed03752d9cfe803f07
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
2015-09-01 05:56:07 +00:00
Qt Submodule Update Bot
0ba6e6ce43 Updated submodules.
Change-Id: I1497a398e34e18abb18f705b2294464840629ca1
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-09-01 05:56:00 +00:00
Jani Heikkinen
812ff69df4 Remove quick1 from default checkout
QtQuick1 was deprecated in Qt 5.5 and will now be removed from
default modules in qt5.git

Change-Id: I88aa9d75ace8d91b4cd469d7511662425e67d95f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-08-27 19:44:22 +00:00
Qt Submodule Update Bot
1497a398e3 Updated submodules.
Change-Id: I56e7af096e889d56ef67baabf38529c0ccb8d8b5
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-08-25 04:33:00 +00:00
Liang Qi
c9425926e1 Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
	qt3d
	qtactiveqt
	qtandroidextras
	qtbase
	qtcanvas3d
	qtconnectivity
	qtdeclarative
	qtdoc
	qtenginio
	qtgraphicaleffects
	qtimageformats
	qtlocation
	qtmacextras
	qtmultimedia
	qtqa
	qtquick1
	qtquickcontrols
	qtrepotools
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwayland
	qtwebchannel
	qtwebengine
	qtwebkit
	qtwebkit-examples
	qtwebsockets
	qtwinextras
	qtx11extras
	qtxmlpatterns

Change-Id: I7410d9be5775ab276fb5a57adb397f4f92d77a50
2015-08-24 16:18:23 +02:00
Qt Submodule Update Bot
56e7af096e Updated submodules.
Change-Id: Icf1e00c471aea0ce5228165735195a9f0f76fe36
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-08-21 09:43:42 +00:00
Qt Submodule Update Bot
cf1e00c471 Updated submodules.
Change-Id: Id60882b0bc98875361477cb5aaf7d12c2693f900
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-08-18 04:24:52 +00:00
Thiago Macieira
d7b8b62cb3 Add the GPLv3 license text
LGPLv3 refers to it but does not include it in its body.

Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
2015-08-14 13:39:09 +02:00
Oswald Buddenhagen
bf5c38f136 Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I5b894e7f72ad81e62a6ea0777e6713dfa36c8a68
2015-08-14 13:38:53 +02:00
Oswald Buddenhagen
3f2ff8b460 Merge remote-tracking branch 'origin/5.4.2' into 5.4
Change-Id: Id8fa6d30810f8bfe46d5aa7e279c69ea560edd19
2015-08-14 13:34:32 +02:00
Mitch Curtis
30e19df5bf Add qtgraphicaleffects as an optional dependency for qtquickcontrols.
This is a prerequisite to making qtgraphicaleffects a dependency in
qtquickcontrols' sync.profile.

Task-number: QTBUG-46393
Change-Id: I3679392a7feb48ecefa4a01a7ecb42b2e6287ecb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-08-13 11:52:55 +00:00
Andrew Knight
3d7fe3b822 gnuwin32: Remove old versions of bison/flex from the distribution
The win_flex/win_bison tools are already in the repository and working
with all projects, so the GnuWin32 versions can be removed and the
winflexbison versions can take their place.

Task-number: QTBUG-46852
Change-Id: I41bc541adab834ff83912d7a4f076a87fc174601
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-08-13 04:45:21 +00:00
Qt Submodule Update Bot
d60882b0bc Updated submodules.
Change-Id: Idbdb4ce40f9456898ac9148dc08473f636f34f1d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-08-13 04:45:15 +00:00
Oswald Buddenhagen
f587983764 fix qtcanvas3d submodule reference
Change-Id: I67d89f5e8d04a1e60ff0aedc33e29da7a58df620
2015-08-12 16:31:03 +02:00
Oswald Buddenhagen
cab251cd8d Adjust submodule branches
Change-Id: I7755bb88167297aef9defaa6b66639fde6e9804d
2015-08-10 16:53:39 +02:00
Qt Submodule Update Bot
dbdb4ce40f Updated submodules.
Change-Id: I20beccb62815f3c6948d888ccfad0b69c42b55e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-08-07 06:55:47 +00:00
Qt Submodule Update Bot
20beccb628 Updated submodules.
Change-Id: Ie77fe47fcec71a13d3640059d1e0ce66a47fc0b2
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-07-14 03:17:43 +00:00
Qt Submodule Update Bot
e77fe47fce Updated submodules.
Change-Id: I22c7d89fd93a256c4051f49b9a9b89789e697df6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-07-11 09:46:26 +00:00
Qt Submodule Update Bot
1d3966833b Updated submodules.
Change-Id: Idc11a328839163ffae5e72f2e43860b12f19c668
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-07-11 03:32:32 +00:00
Qt Submodule Update Bot
22c7d89fd9 Updated submodules.
Change-Id: Ideafacc193da59a1db25e006b16630b74535cbee
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-30 18:19:55 +00:00
Kai Koehne
345e4356b7 README: Replace qt-project.org with qt.io
Change-Id: Iacc4dc8f28ce2c0bb1d761834d0f90b444f47327
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-06-30 18:19:33 +00:00
Qt Submodule Update Bot
deafacc193 Updated submodules.
Change-Id: Ibc862a8b12e46042819341229b31883bc9a1462e
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-29 19:59:42 +00:00
Aaron McCarthy
fb5e3cc2d3 Add qtquickcontrols as an optional dependency to qtlocation module
With the correct modules checked out 'make module-qtlocation' will build
everything necessary to run the examples.

Change-Id: I0c63221b5704c2b13495f3dc3221e888d8e9547c
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2015-06-26 06:46:09 +00:00
Qt Submodule Update Bot
bc862a8b12 Updated submodules.
Change-Id: Ie231e8be72006172dd80ec9f1df8f57e7fc54891
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-26 05:37:28 +00:00
Qt Submodule Update Bot
dc11a32883 Updated submodules.
Change-Id: Ic5910fb0b28553d1eb0815e578381fd358e342fc
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-25 19:31:21 +00:00
Qt Submodule Update Bot
e231e8be72 Updated submodules.
Change-Id: Icc425a6784ea3ae379716ddb1e79a8a07ccd8d74
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-25 19:31:02 +00:00
Qt Submodule Update Bot
cc425a6784 Updated submodules.
Change-Id: I88f32b10ee95f967686bf9c3295887b4ebb62eba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-24 07:00:47 +00:00
Qt Submodule Update Bot
c5910fb0b2 Updated submodules.
Change-Id: Ic5e879665945d79c0fcdb27c2c00978b7abdeef6
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-23 19:28:08 +00:00
Qt Submodule Update Bot
c5e8796659 Updated submodules.
Change-Id: I5c321f6626e9bf6f64f2c120e8281547e2561880
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-21 11:31:31 +00:00
Qt Submodule Update Bot
5c321f6626 Updated submodules.
Change-Id: I3009287ec75bfa7b3084fad32a75552656845434
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-20 17:13:47 +00:00
Qt Submodule Update Bot
88f32b10ee Updated submodules.
Change-Id: Ibc644efc00d00f43c1d202106bae6facf015c7fb
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-20 06:59:07 +00:00
Qt Submodule Update Bot
0d60d720f8 Updated submodules.
Change-Id: I00defc7101f1cabc0cc540a84846ec9b7933f599
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-19 18:49:53 +00:00
Qt Submodule Update Bot
3009287ec7 Updated submodules.
Change-Id: I7257e86c7381f5237c2c135a4395e88b65735cd3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-06-18 04:43:56 +00:00
Qt Submodule Update Bot
bc644efc00 Updated submodules.
Change-Id: Ia820c1611af25853deb8161041adf39b7bfa61db
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-17 12:04:07 +00:00
Qt Submodule Update Bot
7257e86c73 Updated submodules.
Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-06-09 04:27:26 +00:00
Qt Submodule Update Bot
a820c1611a Updated submodules.
Change-Id: I5384ff79efab1a68cfb665f1e764d7f5ee73fcba
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-07 05:40:06 +00:00
Michael Olbrich
935ffc2e5f qtdeclarative is an optional dependency for qtwebkit
This way qtwebkit can be built when qtdeclarative is disabled. This is
especially useful for targets without OpenGL.

Also add qtxmlpatterns to the optional dependencies. It was an indirect
dependency before via qtdeclarative.

Change-Id: Ib4c29b958bd63d528fba8ec326e2dbc1ea8bce08
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
2015-06-05 19:05:46 +00:00
Qt Submodule Update Bot
5384ff79ef Updated submodules.
Change-Id: I4fc367abe95ee78166067047d0f229bba9991956
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-06-04 20:03:11 +00:00
Qt Submodule Update Bot
4fc367abe9 Updated submodules.
Change-Id: I88af8ac70704e63a2154b3fe22b51483a69d84c3
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-31 06:59:17 +00:00
Qt Submodule Update Bot
00defc7101 Updated submodules.
Change-Id: Ib62714f88c3cd381cbbf8758c7b1029c2fa254ed
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-31 06:58:29 +00:00
Qt Submodule Update Bot
88af8ac707 Updated submodules.
Change-Id: I57641bf25f49f0f8eb55ccb08a4ede2d6a7af499
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-29 19:19:51 +00:00
Oswald Buddenhagen
4a5968ce75 Merge branch '5.4' into 5.4.2
Change-Id: I33d967b5f668c672a55ad93ac314340453850521
2015-05-29 20:12:13 +02:00
Oswald Buddenhagen
843a3407f2 Merge tag 'v5.4.1' into 5.4
Qt 5.4.1 Release
2015-05-29 15:53:05 +02:00
Oswald Buddenhagen
5400507252 Merge tag 'v5.4.0' into 5.4
Qt 5.4.0 Release
2015-05-29 15:52:28 +02:00
Qt Submodule Update Bot
210493d641 Updated submodules.
Change-Id: I670466b6a3ff58edb40c91ff86c443cd6dd20126
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-29 09:18:21 +00:00
Qt Submodule Update Bot
670466b6a3 Updated submodules.
Change-Id: I07856d73e19b60fbc01ff650cddb1d557db35617
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-28 11:33:18 +00:00
Andrew Knight
ea14bacdc8 Set win_bison/win_flex executable
This fixes failed execution when the Qt sources are exported to
Windows over a network share or attempted to be executed on a Linux
system using binfmt.

Change-Id: I00b1073e516d2441498a39cc13e4295484e1ef9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-27 16:13:29 +00:00
Qt Submodule Update Bot
57641bf25f Updated submodules.
Change-Id: I31ee12ede4defe80e20dd49b9ca7b425b6758965
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-27 16:13:26 +00:00
Qt Submodule Update Bot
07856d73e1 Updated submodules.
Change-Id: Idfffbfdc266be3f52f716b152bbcb70810127cc9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-23 06:51:36 +00:00
Qt Submodule Update Bot
31ee12ede4 Updated submodules.
Change-Id: I833cf03a1efe7ef6fa8f11020826063804ebddaa
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-19 09:48:15 +00:00
Qt Submodule Update Bot
dfffbfdc26 Updated submodules.
Change-Id: I24f1b3219d1db41acc3f0781fa38f253bcb04da3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-16 04:57:35 +00:00
Qt Submodule Update Bot
833cf03a1e Updated submodules.
Change-Id: I619984c9c8d142c465bb86a571d101ac564676d2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-15 10:34:29 +00:00
Qt Submodule Update Bot
b62714f88c Updated submodules.
Change-Id: I68b5c48282234a27f7c96595c8d84a4dc0bb3871
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-14 14:37:56 +00:00
Qt Submodule Update Bot
24f1b3219d Updated submodules.
Change-Id: If7cb995d04fdc05b35df8b6c5215bf530006b984
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2015-05-13 15:55:59 +00:00
Qt Submodule Update Bot
619984c9c8 Updated submodules.
Change-Id: I56a80384b1c5fef07b53d41bcc8567177f6f43db
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-09 16:06:13 +00:00
Qt Submodule Update Bot
f7cb995d04 Updated submodules.
Change-Id: I11963ba9f0141fc72dadedffe2c36fba5be16186
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-09 12:22:09 +00:00
Qt Submodule Update Bot
56a80384b1 Updated submodules.
Change-Id: I359f9925da5f735a654ab18efbc68305f5dadfd2
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-07 05:58:41 +00:00
Qt Submodule Update Bot
359f9925da Updated submodules.
Change-Id: Ic38d3b26e9a53fb6b0671ebfdbd05f6a925fe668
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-03 07:57:46 +00:00
Qt Submodule Update Bot
11963ba9f0 Updated submodules.
Change-Id: I39ce0228dad0d141df17ea5f911046130f823467
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-05-03 07:57:31 +00:00
Qt Submodule Update Bot
c38d3b26e9 Updated submodules.
Change-Id: I0d362ee5568abc3943a83b10ae8b6444103ff8c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-29 17:37:59 +00:00
Qt Submodule Update Bot
39ce0228da Updated submodules.
Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-28 10:58:28 +00:00
Qt Submodule Update Bot
0d362ee556 Updated submodules.
Change-Id: I976ffd988e7ec7b595ed610d86bf58307c5e5434
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-28 04:35:07 +00:00
Frederik Gladhorn
9edcb24889 Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
	qt3d
	qtactiveqt
	qtandroidextras
	qtbase
	qtcanvas3d
	qtconnectivity
	qtdeclarative
	qtdoc
	qtenginio
	qtimageformats
	qtlocation
	qtmacextras
	qtmultimedia
	qtqa
	qtquick1
	qtquickcontrols
	qtrepotools
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwayland
	qtwebengine
	qtwebkit
	qtwebkit-examples
	qtwebsockets
	qtwinextras
	qtxmlpatterns

Change-Id: I691dbbe6d3399d601336bb7e309579fb89d6381c
2015-04-21 16:26:04 +02:00
Sergio Ahumada
95bb29e243 Replace old qt-project.org wiki with wiki.qt.io
Change-Id: I9a1114a8b5da649d3da718248fe5df5781810c20
Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-16 09:42:01 +00:00
Qt Submodule Update Bot
68b5c48282 Updated submodules.
Change-Id: I59e3021a529806b8b2ae7676b8f687099384f7e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-15 09:16:10 +00:00
Qt Submodule Update Bot
976ffd988e Updated submodules.
Change-Id: I1d66817cbc1f67e7fd8e2d3f92ec39af344a2f43
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-14 04:20:21 +00:00
Oswald Buddenhagen
451f0a193b Adjust submodule branches
Change-Id: Ib30d8a8c4691787c460fe6540b64e2d593422c68
2015-04-10 12:10:34 +02:00
Qt Submodule Update Bot
59e3021a52 Updated submodules.
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-09 09:28:44 +00:00
Qt Submodule Update Bot
1d66817cbc Updated submodules.
Change-Id: I95930e98758f357598c5aaa8fce39ca7f3f549a4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-09 04:45:52 +00:00
Qt Submodule Update Bot
95930e9875 Updated submodules.
Change-Id: I8ad3df2f5d5e93ea8b6e9b823a83e9738f3bf489
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-07 10:28:48 +00:00
Caroline Chao
697291ef10 Remove specific rules for QtWayland
Let the module handle the platforms by itself.
See QtWayland change: 0448026b4ee75

Change-Id: I622d17d6219e71fb0ad014442763b515e58079af
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-04-01 04:27:17 +00:00
Andrew Knight
98c4f1bbeb Upgrade win_flex/win_bison to 2.5.5 (bison 3.0)
This version is required by upstream ANGLE. win_bison conveniently uses a
different executable name as the existing bison copy, avoiding conflicts.

Change-Id: I2897ce97aef6795933d3ab8b5570a8494a55523e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2015-04-01 04:27:00 +00:00
Qt Submodule Update Bot
8ad3df2f5d Updated submodules.
Change-Id: Ie0b703ccb7081240278fd803d18d3da11bc3b1b7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-04-01 04:26:47 +00:00
Simon Hausmann
b34e3669ff Prospective fix for unnecessary submodule cloning
When cloning qtdeclarative, we end up also cloning qtdeclarative-testsuites,
which is not intentional for users of Qt (and init-repository). The init-repository
script checks for the submodule "repo".update key and skips the sub module if the value
is "ignore". However according to the documentation no checkout is to be done if the value
is "none", which is also what qtdeclarative's .gitmodules specifies for the ecmascript
test suite.

Change-Id: Ieb37607ae4ea7c32d6af886d3e2533fb9dea1f13
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-03-27 10:04:11 +00:00
Jani Heikkinen
1b9d3e4ec0 Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev 2015-03-27 10:04:06 +00:00
Qt Submodule Update Bot
b02397e9df Updated submodules.
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-03-27 10:03:59 +00:00
Qt Submodule Update Bot
e0b703ccb7 Updated submodules.
Change-Id: Icdc3bf5bd941362d1291566b94a67e6d6456a1ad
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-03-26 05:26:21 +00:00
Qt Submodule Update Bot
cdc3bf5bd9 Updated submodules.
Change-Id: I43a2c55cdea1098a23221915571445c1d5f23c2b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-03-20 20:52:06 +00:00
Oswald Buddenhagen
4afaae4020 Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I44a6915c1212bb636456368a2b5dc36b9c26fe01
2015-03-20 13:17:05 +01:00
Qt Submodule Update Bot
43a2c55cde Updated submodules.
Change-Id: I1b9965bf167e4a510bb8662ea11e6ee71a566772
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-03-18 12:41:19 +00:00
Qt Submodule Update Bot
1b9965bf16 Updated submodules.
Change-Id: I9a9865ce282d870f755e08438ba187061a41ed9d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-03-13 18:29:44 +00:00
Jani Heikkinen
cb28f324e5 Added Qt3D as a part of qt5.git default repositories
Change-Id: I0e74e6c6ab6c347396c449859b1cf24752a42fb8
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
2015-03-13 18:29:34 +00:00
Oswald Buddenhagen
a5edc40176 Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-09 12:28:37 +01:00
Oswald Buddenhagen
ac6168c0cb use git clone --branch instead of --no-checkout
git submodule update does not cause an actual checkout if HEAD matches
the recorded submodule sha1 even if it was not actually checked out.

it would be possible to work around this by calling git checkout HEAD in
each submodule if no files are checked out, but that seems hacky.

instead, just make the module cloning already check out the desired
branch. this produces checkouts that are within a few commits of the
final sha1, so isn't too bad.

Change-Id: I435c1a2e24f39fd8c0d65f0d90df0216715668b7
2015-03-04 12:23:13 +01:00
Oswald Buddenhagen
4b962aee82 Merge remote-tracking branch 'origin/dev' into 5.5
Conflicts:
	.gitmodules

Change-Id: I45e015a2c4eb3778d2346569de9b7f09e72a58bf
2015-03-03 11:21:03 +01:00
Jani Heikkinen
c2d151522b Update copyright headers
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.

Change-Id: Ieb3be34b0d4061fb8dc886991528951f59dbd67e
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2015-02-25 03:23:07 +00:00
Qt Submodule Update Bot
9a9865ce28 Updated submodules.
Change-Id: Ibe35b9f9af23a2b84ccab7e24b10e70d9324e42b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-25 03:22:48 +00:00
Alex Blasche
811a77a53c Add qtdeclarative as optional dependency for qtlocation
Change-Id: Id6d406cd98b64ba111d1eb9cb0b03360a05fbca7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-02-17 06:42:55 +00:00
Qt Submodule Update Bot
e3cd5bb368 Updated submodules.
Change-Id: I0badf6179237bb89ffc57c7387cbf21ebc3b6665
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-16 19:57:25 +00:00
Oswald Buddenhagen
f46b8dc760 Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ie7b1685080b978cc1d8790823f79e98e930ca147
2015-02-16 16:24:40 +01:00
Oswald Buddenhagen
f900f38f71 Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
	qtandroidextras
	qtbase
	qtconnectivity
	qtdeclarative
	qtdoc
	qtenginio
	qtmacextras
	qtmultimedia
	qtquick1
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qtwayland
	qtwebchannel
	qtwebengine
	qtwebkit
	qtwebsockets
	qtwinextras
	qtx11extras
	qtxmlpatterns

Change-Id: I98b5e8165cd8575888d18198d8d8e8412e7bfaf0
2015-02-16 16:19:22 +01:00
Oswald Buddenhagen
122d4551b5 Adjust submodule branches
Change-Id: I952bb9255a393baec2d9ede1cabfca7a47e2dc93
2015-02-16 15:50:02 +01:00
Qt Submodule Update Bot
be35b9f9af Updated submodules.
Change-Id: Idc93c0d4d7c8e30258fb3ad9f4735e4c9d07457c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-14 11:18:41 +00:00
Qt Submodule Update Bot
0badf61792 Updated submodules.
Change-Id: I98737b388b9898507bebcd8d05a86e7d916b6d25
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-14 08:54:49 +00:00
Qt Submodule Update Bot
2c39898934 Updated submodules.
Change-Id: I9347499e78f03710eaf24af3c1e7ac650d0ef81d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-13 15:11:39 +00:00
Pasi Keranen
682766b9fa Add qtcanvas3d as submodule
[ChangeLog][General] Added QtCanvas3D module, a JavaScript 3D rendering API for QtQuick.

Change-Id: I9448f87ba8c8ccfb2dd6cf790d29bb561b9e9740
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-13 15:11:19 +00:00
Qt Submodule Update Bot
98737b388b Updated submodules.
Change-Id: I9fb1a2e12fb6562c22dbac5fbca06d33046a5030
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-13 04:29:58 +00:00
Pierre Rossi
3e40bbd114 QtWebEngine: add dependency on QtWebChannel
To allow using the integration that makes use of a custom transport over
Chromium IPC.
Also add QtLocation as an optional dependency for correctness, and
update the pinned sha1

Change-Id: I71d88be0859a74ad82f539d00f02b51d1c3e5218
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
2015-02-11 21:59:19 +00:00
Qt Submodule Update Bot
9fb1a2e12f Updated submodules.
Change-Id: Ib71478c424ed0a6fd8d058513aa9a68dda71336f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-10 09:18:23 +00:00
Qt Submodule Update Bot
b71478c424 Updated submodules.
Change-Id: I81efb6de3c49e6779556b1d1dfe06f1e1bc574f6
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-06 17:00:48 +00:00
Qt Submodule Update Bot
dc93c0d4d7 Updated submodules.
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-06 06:24:23 +00:00
Oswald Buddenhagen
34c7caab3f don't fetch again when updating submodules
we already did it a moment ago.

this should affect only the --remote case, but there is no harm in
always specifying it.

Change-Id: I3ef0854c790726772fb63ab7829b59ef85ac4f18
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-06 06:24:10 +00:00
Oswald Buddenhagen
9ebad7830d don't checkout when cloning
we will subsequently do a submodule update with a possibly different
sha1 anyway.

Change-Id: I4950f3727e4263a73c32eff8460962d5796bc5f3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-06 06:24:06 +00:00
Oswald Buddenhagen
1ad0a17fa0 make manual fetching sane
it is in no way said that the remote's HEAD will contain the commit to
be checked out - in fact, it's pretty much guaranteed that it won't for
anything but the default branch. fetching the whole remote avoids
additional roundtrips and makes the --branch feature actually work
reasonably.

Change-Id: I20de2da848b12aea8c5b2784307fe9860252009b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-02-06 06:24:03 +00:00
Oswald Buddenhagen
d553fc4fa9 always check out the target branch when using --branch
a submodule update with --remote will use the tip of the remote's
branch, but it won't actually switch to the branch if HEAD doesn't point
to it yet.

Change-Id: If13e31da2646683dfb9e832eaab929190acb0167
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
2015-02-06 06:23:59 +00:00
Oswald Buddenhagen
b236ef6aef fix --branch without --no-update
clearly, i botched the syntax, but i can't even tell how. that's perl.
the new version is more readable anyway.

Change-Id: Ic3e93c2cf30ee92f368808070899af4b9f7809a3
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
2015-02-06 06:23:54 +00:00
Alex Blasche
f36d7e5d9b QtLocation doesn't depend on QtMultimedia anymore.
Change-Id: Id75a7fc591064639a38694149517924dd33b56fb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-02-04 06:15:03 +00:00
Qt Submodule Update Bot
81efb6de3c Updated submodules.
Change-Id: Ief1f126ddc66293b041fe5658d57056761eefe05
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-02-03 11:14:37 +00:00
Qt Submodule Update Bot
9347499e78 Updated submodules.
Change-Id: I25db2aa87f437c03d7929959c3e6d94d9fc0d541
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-01-29 09:13:14 +00:00
Qt Submodule Update Bot
ef1f126ddc Updated submodules.
Change-Id: I0163cb617aa19a26423a716bef23bfc6308aadc6
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-01-29 04:28:53 +00:00
Oswald Buddenhagen
c3a6185b7e Adjust submodule branches
Change-Id: I6f2358370d81238f462d26388d85aa5f74a8b455
2015-01-08 12:53:09 +01:00
Sean Harmer
6fd8d9ffd5 Qt3D depends upon qtimageformats module
Qt3D makes use of the webp image format in its examples to minimize
the size of assets. Support for webp is provided by qtimageformats.

Change-Id: Id70b584123dc6174848947029ee034593ccc42e0
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2014-12-30 13:24:35 +01:00
Qt Submodule Update Bot
0163cb617a Updated submodules.
Change-Id: I9ca0c5251312fbb7b83264eff28ef98287c7f70d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-23 11:41:25 +01:00
Qt Submodule Update Bot
25db2aa87f Updated submodules.
Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-18 08:14:43 +01:00
Qt Submodule Update Bot
9ca0c52513 Updated submodules.
Change-Id: Ia68a6b964f770fef3ea3d52f29d0c7a86186e80c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-15 08:29:57 +01:00
Oswald Buddenhagen
7943697cdd adjust submodule branch names for dev branch
Change-Id: I65ea644943aa345b8f0fd1d5fcdfccf8f86ed914
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2014-12-05 14:53:15 +01:00
Oswald Buddenhagen
028bfeeee3 Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ia8938b7bb2c0393c1799b64309c3cadc7293ad8e
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2014-12-05 14:51:59 +01:00
Alex Blasche
a22e673995 Revert "Skip not supported modules on wince."
The decision to exclude wince builds from Qt is one the modules
have to do and not the "build system". While there might be
justification to do this for some modules the decision is a module
decision and as such the individual modules should make it.

This reverts commit d870bd65b0.

Change-Id: I60fd9944a71968c819a27da91fdc58923bbbb776
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-12-05 14:50:34 +01:00
Qt Submodule Update Bot
3439140073 Updated submodules.
Change-Id: I1998742ceac59b50864ccec46a6c2f255871ab30
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-05 10:51:00 +01:00
Qt Submodule Update Bot
1998742cea Updated submodules.
Change-Id: Ib1885ea72539f3bd2df4d4131f0b164b02d4b59f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-12-04 13:50:13 +01:00
Qt Submodule Update Bot
a68a6b964f Updated submodules.
Change-Id: I968f8a2a5ef20c47184d15b8f9e92a795176fcb2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-12-02 12:15:22 +01:00
Oswald Buddenhagen
663f814c24 adjust submodule branch names for 5.4 branch
Change-Id: I1621fee44becf1940d7d50a604fa8c91f3be78d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2014-12-02 12:15:15 +01:00
Qt Submodule Update Bot
b1885ea725 Updated submodules.
Change-Id: I338ee26271c05b612fc58381270ca471db12aaef
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-27 06:41:45 +01:00
Oswald Buddenhagen
6040cb2ff5 Merge remote-tracking branch 'origin/5.4.0' into 5.4
Change-Id: I5b2910fc4e8fece8fad42eb200ed6dffdd24f751
2014-11-25 18:00:25 +01:00
Qt Submodule Update Bot
338ee26271 Updated submodules.
Change-Id: I77f387bc89c06d870b7d41516734ee3f1c68e71a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-25 05:39:27 +01:00
Qt Submodule Update Bot
77f387bc89 Updated submodules.
Change-Id: I7c0bc2305680fac216bbaa72ac83f65b04feffff
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-21 09:26:31 +01:00
Qt Submodule Update Bot
968f8a2a5e Updated submodules.
Change-Id: Icafd720586cfe92d6e5773d553f6e70594f6c7dc
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-20 09:02:53 +01:00
Qt Submodule Update Bot
7c0bc23056 Updated submodules.
Change-Id: I4b199501287c5a5961405ae0667c04dc1188af44
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-20 07:00:26 +01:00
Qt Submodule Update Bot
4b19950128 Updated submodules.
Change-Id: I96d903eec0ee9d2fd76e1e3f1ebfd868ad937dbe
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-19 05:46:17 +01:00
Qt Submodule Update Bot
96d903eec0 Updated submodules.
Change-Id: Ie8053418e43127327f6df892ae774a1707a9ae97
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-12 22:35:27 +01:00
Oswald Buddenhagen
38cfc8ec95 don't fetch unless we are updating
it's just wasting time.

Change-Id: I541cc535c5c95b0140cfa14d7cb042dbe029525e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2014-11-12 10:49:16 +01:00
Kai Koehne
402bf7aec2 Fix cloning with mirrors
Commit 486f5f37761 broke the cloning with one of the mirror options:

git ls-remote git://mirror/qt/qtactiveqt.git.git test/if/mirror/exists
fatal: The remote end hung up unexpectedly

Change-Id: Ia154ee34dd10e35b24676777d8dde98ef0790ee1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-11-12 10:49:07 +01:00
Kai Koehne
8f35cb2886 Fix description of --mirror argument
The argument actually requires a trailing slash.

Change-Id: Idc2567746d2b3f4ebf31c2bce5ec683d2a1f425b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-11-12 10:48:54 +01:00
Oswald Buddenhagen
d5946d420f teach init-repository about branches
specifically, add the --branch option and the necessary keys to
.gitmodules.

Change-Id: I09e2df6bd012629f76a35238d66697637bdffe44
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-11-12 10:48:37 +01:00
Qt Submodule Update Bot
e8053418e4 Updated submodules.
Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-10 06:41:19 +01:00
Qt Submodule Update Bot
cafd720586 Updated submodules.
Change-Id: I201b4c135a571bdf2621cbac03a9ab46a352b60f
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-07 12:28:28 +01:00
Qt Submodule Update Bot
201b4c135a Updated submodules.
Change-Id: Ica7018cd4f892d0b6938ab276305f6ae02dcc07b
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-04 08:00:22 +01:00
Jan Arve Saether
00a3c36bc1 Ignore alternate if its not a git repo
Don't just check if the submodule folder exist, since that doesn't
qualify it for being a valid git repo.

Change-Id: Ia3902714a0554908c0b8fd3228ed6fc2cfddd344
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-11-03 12:50:42 +01:00
Qt Submodule Update Bot
ca7018cd4f Updated submodules.
Change-Id: I00e3f00b799e15d95895f70887cf5b1b6d3bc372
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2014-11-03 07:59:03 +01:00
Qt Submodule Update Bot
00e3f00b79 Updated submodules.
Change-Id: Ia87766e218ab82cd1da216ea2cd023790fea6e8c
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-31 06:50:24 +01:00
Qt Submodule Update Bot
a87766e218 Updated submodules.
Change-Id: Ib54838f4a5c3ad05843c680252c45458a4572fb5
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-30 06:39:30 +01:00
Qt Submodule Update Bot
b54838f4a5 Updated submodules.
Change-Id: I18cc387deb811a2870842837353d6322511e1872
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-29 06:46:07 +01:00
Qt Submodule Update Bot
18cc387deb Updated submodules.
Change-Id: I86f7d9ce9873b5c6897e99763aba5765640ceba3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-28 06:54:29 +01:00
Qt Submodule Update Bot
86f7d9ce98 Updated submodules.
Change-Id: I3f0739b279123e0a049d52da455f40ad1a20b4ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-23 17:46:28 +02:00
Bruno Coudoin
cd12d1f202 fix to let init-repository work on non english locale
This patch forces the C locale before calling 'git submodule'
in order to get the non localized string 'Entering' that we filter out.

Change-Id: I46d3770956a6b07e574ad15549bbb8942285b800
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-10-17 13:26:43 +02:00
Qt Submodule Update Bot
3f0739b279 Updated submodules.
Change-Id: Id8a40d65705b36a269accb68f7d82d7ee5fa925f
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-17 13:26:35 +02:00
Qt Submodule Update Bot
a17124e831 Updated submodules.
Change-Id: I869fce8a6bd6db20b58facdd2a476dacdf3b7d69
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-16 11:27:42 +02:00
Qt Submodule Update Bot
d8a40d6570 Updated submodules.
Change-Id: I2f80b640ab55f99b2379a41e6ce8c7df30f138a4
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2014-10-13 09:08:32 +02:00
Qt Submodule Update Bot
2f80b640ab Updated submodules.
Change-Id: Ib927255703d49def6c732f196a6265f6ed08a691
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-10-01 12:35:05 +02:00
Qt Submodule Update Bot
b927255703 Updated submodules.
Change-Id: I361f771ae66d1128f407992c228c1c76b0e69e4c
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2014-09-30 17:52:01 +02:00
Qt Submodule Update Bot
361f771ae6 Updated submodules.
Change-Id: Ie6af514f7185fc618f5093accedfb4f0937e5039
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-25 06:59:10 +02:00
Matti Paaso
d063e757b1 Adding qtquick1 and qtwayland also into submodule initialization
Without these components, src package creation fails in packaging.

Change-Id: I402c9c49642bccf821c3719206d1dea9415760c6
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-25 06:58:45 +02:00
Qt Submodule Update Bot
e6af514f71 Updated submodules.
Change-Id: Ib2e577904b850ea2ba3a8223688b05a21b4921f7
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-24 06:49:56 +02:00
Joerg Bornemann
597bb62d2b remove qtjsondb
It's dead, Jim.

Change-Id: Id8e1ddb266018bfd582af27bb7eb860287e4567c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-23 20:29:32 +02:00
Oswald Buddenhagen
0af9ceef91 properly recurse submodule initialization
Change-Id: Icd438b9da9af0275dd508186a265bc211d9d01ce
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:12 +02:00
Oswald Buddenhagen
934651b766 don't unnecessarily initialize unwanted submodules
it wastes time and causes output noise.

Change-Id: Ifee01150293431b3c528f30a46280bd142e30b22
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:06 +02:00
Oswald Buddenhagen
836f00a76e don't uninit submodules before re-initing
git-submodule init will simply not touch the already initialized
submodules. this is just fine, as we'll overwrite the config entries
with our own urls (and remove the obsolete ones) afterwards anyway.

Change-Id: I6372bd48be9792e456899dc829226921990140c4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:04 +02:00
Oswald Buddenhagen
6ab23f16f5 keep information about default repos in .gitmodules
it's backwards to keep this in the script itself.

Change-Id: I4248ba3fef984bdff5d034cb2e6db6cae3209d68
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:02 +02:00
Oswald Buddenhagen
485f5f3776 don't pass around url unnecessarily
we now have everything we need to construct it on the fly.

Change-Id: I129e49bbcf46428d0fcef31ab8188df9d6a4026c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:29:01 +02:00
Oswald Buddenhagen
4553d9ec11 get submodule urls from .gitmodules
keeping a redundant copy in the script is plain backwards.

Change-Id: Ibdd1bab9d2cb5af7d7747d5caa2afc7d6e7571ad
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:28:59 +02:00
Oswald Buddenhagen
3ade7c4567 rewrite submodule exclusion logic
instead of doing multiple passes over the submodules, do everything in
one go.

as a bonus, as the internal structure uses exclusion entries in the
module list, we can make that feature user-accessible just as well.

Change-Id: I8bfb30c8051a9150f92e2e124ff52f64e3efe03c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:28:58 +02:00
Oswald Buddenhagen
93f173b3c5 nuke the --http option
it was a vestige from the times when the submodules had absolute urls
pointing at git://gitorious.org. as we now use relative urls, things
work just fine without that option.

Change-Id: I5e93ff8cd2497a27cfbdd53dbcf9db3cd0c4cd1d
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-09-23 20:28:56 +02:00
Qt Submodule Update Bot
b2e577904b Updated submodules.
Change-Id: I919c0332ff9f5ad1979de3105721c2ba5aacf634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-23 15:10:43 +02:00
Qt Submodule Update Bot
919c0332ff Updated submodules.
Change-Id: I1e275c54ea722d4f882cf329b65b749aa4d45fb2
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-15 17:09:26 +02:00
Qt Submodule Update Bot
869fce8a6b Updated submodules.
Change-Id: Ie3a3e5d05bb46e1f80d1c83d4d3c564040a6ae14
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-12 20:16:37 +02:00
Qt Submodule Update Bot
1e275c54ea Updated submodules.
Change-Id: I5fdb4490cb85b3470bdbd81de9dccbe6bcb96460
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-11 16:30:52 +02:00
Jocelyn Turcotte
1ae0689829 init-repository: Support cases where $submodule/.git is a file
Since git 1.7.8 the $GIT_DIR of the submodule can be a reference to the
super-module's $GIT_DIR/modules/<name>/

Test for existence instead of testing for a directory before attempting
a git clone there.

Change-Id: Ic539e770067da1417a2ad374c21253212473abe6
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-10 18:24:13 +02:00
Qt Submodule Update Bot
5fdb4490cb Updated submodules.
Change-Id: I74d7cf7e426ba4e1aa640ac986fbbe52d1e82897
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-07 16:17:49 +02:00
Qt Submodule Update Bot
74d7cf7e42 Updated submodules.
Change-Id: If16e291eea490110a9749b65fa4d21988376755a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-04 11:16:45 +02:00
Qt Submodule Update Bot
e3a3e5d05b Updated submodules.
Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-02 20:36:04 +02:00
Qt Submodule Update Bot
f16e291eea Updated submodules.
Change-Id: Iaa47c338f81e080e1fde4501e72ee48c9330e1be
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-02 20:34:14 +02:00
Qt Submodule Update Bot
aa47c338f8 Updated submodules.
Change-Id: I2159de889d951926d780041338d948f4a1281aa3
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-09-01 17:06:23 +02:00
Qt Submodule Update Bot
2159de889d Updated submodules.
Change-Id: Ifefebb996cc9dcb2cc2b06f57315a4a679f96420
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-08-31 14:59:32 +02:00
Qt Submodule Update Bot
fefebb996c Updated submodules.
Change-Id: I2c3556629bab77b013eabcf6535512e902837e40
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-08-30 05:11:09 +02:00
Jani Heikkinen
59c32b2db8 Updated license files in Qt5
- Renamed LICENSE.LGPL to LICENSE.LGPLv21
- Added LICENSE.LGPLv3 & LICENSE.GPLv2
- Removed LICENSE.GPL

Change-Id: I49f5a4bf3481d6cd712301092f5f20a5dac470cf
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-08-30 05:10:46 +02:00
Frederik Gladhorn
22e5c8ce25 Add qtwebengine as submodule
qtwebkit is listed as an optional dependency for
qtwebengine to ensure that qtwebkit and qtwebengine
are not linked in parallel on the CI system.
Otherwise we could run out of memory.

Change-Id: Ib80d72407df03037c928d99f55c8e04e98e506d9
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
2014-08-29 14:28:35 +02:00
Bjoern Breitmeyer
d870bd65b0 Skip not supported modules on wince.
Change-Id: I6ac73c759453813718c6d96c7d6cb27bcbf9815b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-08-28 08:34:39 +02:00
Qt Submodule Update Bot
2c3556629b Updated submodules.
Change-Id: Ie073b25926d4c538cb9f41d4c59d171857a60ede
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-08-27 20:33:00 +02:00
Frederik Gladhorn
64b0e38032 Add QtWayland to default checkout
QtWayland is going to be released with Qt 5.4.

Change-Id: I9a9bead92c6c34324510007ad844c9fdf633690d
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2014-08-20 12:56:30 +02:00
Milian Wolff
be6de20889 Add QtWebChannel as optional dependency of QtWebKit.
This is required to prepare the merge of the integration patch.
The QtWebChannel and QtWebSockets lines in qt.pro are moved such
that they occur before their first use in QtWebKit.

Change-Id: Ie8137da57827776fe7b1434538df6b08108b0349
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-08-15 09:03:39 +02:00
Jocelyn Turcotte
633051d095 init-repository: Support submodules more than one dir deep
Change-Id: I8783ded72032dda42bc24a855e190e0a2e699b01
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-08-15 09:03:24 +02:00
Jocelyn Turcotte
ce45f45dfb init-repository: Make sure that we update a submodule before we recurse
Unless we do so, doing git submodule init in a submodule would use the
currently checked out version of its .gitmodule instead of the one of
its pinned SHA1.

Change-Id: I88de421c8d24748dcaa5334c82da2aac4b12b2ad
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
2014-08-15 09:03:16 +02:00
Jocelyn Turcotte
8801fd0258 Let init-repository build the mirror URL from the original URL
This allows repositories that have a different submodule name than their
URL file part to be using the mirror.

i.e. qtwebengine's src/3rdparty mapped to .../qt/qtwebengine-chromium.git

Change-Id: Ibea9cb9db701c95fc6f8b0e2457de74823aeeba5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-08-15 09:02:58 +02:00
Frederik Gladhorn
48cd6bb500 Build Wayland on Linux (except Android)
Change-Id: Ief1276f88837885637d0e60c90c4713bd12f6c85
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
2014-08-14 14:25:13 +02:00
Andras Becsi
ed9a5c8a62 initialize qtwebengine's chromium submodule after cloning it
Change-Id: I7e3ef09eb437f700c6fe010ce44a711118e8bd75
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-08-12 16:03:32 +02:00
Frederik Gladhorn
9677483cdc Add qtwebchannel as submodule
This also updates the qtwebsockets revision since
that's needed to compile.

Change-Id: I9f3564c78d08abdca73ce395f31b3031a829e502
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2014-08-08 19:50:01 +02:00
Qt Submodule Update Bot
e073b25926 Updated submodules.
Change-Id: I6ccb1f47aa3f394d6e2e80ffcd0dada345d1fea1
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-08-08 07:48:56 +02:00
Qt Submodule Update Bot
6ccb1f47aa Updated submodules.
Change-Id: I091f46c34c950237bdd5054367b5c26e4c291fad
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-08-01 07:44:21 +02:00
Qt Submodule Update Bot
091f46c34c Updated submodules.
Change-Id: Iffab81d96aa4e91c14fe3ff888dd4323092a261e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-07-30 08:04:43 +02:00
Alex Blasche
f81391639e Remove jsondb from qtpim dependency list
Change-Id: Icf05e7857b02db74c7309d796be7ef259cf83e37
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2014-06-18 16:23:26 +02:00
Qt Submodule Update Bot
ffab81d96a Updated submodules.
Change-Id: If4479c349b595d28e0dd4985259d7d1ed00bb966
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-06-17 22:54:51 +02:00
Sergio Ahumada
892e391cb0 Updated submodules.
Change-Id: I000a16c22c4c3dc7d0e02aeb370454f386bb09f1
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-06-04 09:56:56 +02:00
Sergio Ahumada
7368b4b1e3 Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ib1694808847f26576cc3c7780bd1c6d3689a8a26
2014-05-26 15:44:48 +02:00
Qt Submodule Update Bot
f4479c349b Updated submodules.
Change-Id: I620dc10e25cac7386182a6ff272b904f5f9f1a0d
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-05-25 11:15:55 +02:00
Qt Submodule Update Bot
620dc10e25 Updated submodules.
Change-Id: I64f379141c59c193e3ebba5816495498c1ed0e64
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-05-21 06:51:08 +02:00
Oswald Buddenhagen
3fb8e1301a don't claim that multimedia needs quick
it's a soft dependency and it appears to be properly checked in the
subprojects.

Task-number: QTBUG-38616
Change-Id: I5ada1f91247ba3668015e95d6da9c5996f1a138c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
2014-05-13 18:49:52 +02:00
Qt Submodule Update Bot
64f379141c Updated submodules.
Change-Id: Ic9eb01ba38cca9c77a533f32d5f2f0519ec56aa3
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-05-13 18:49:40 +02:00
Qt Submodule Update Bot
c9eb01ba38 Updated submodules.
Change-Id: I25acd00fedc81040b0b108120b21deedafcf7fa4
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-05-04 13:24:01 +02:00
Qt Submodule Update Bot
25acd00fed Updated submodules.
Change-Id: I055e2822456ad09cc939c628e4a86105eda5dade
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-26 19:55:35 +02:00
Qt Submodule Update Bot
055e282245 Updated submodules.
Change-Id: I56a5eee34a20e5de06ee8b430afa5c32ca6b94c6
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-09 17:34:51 +02:00
Qt Submodule Update Bot
afd8acb9dc Updated submodules.
Change-Id: I9b93bd0fa9b5011b27ab351ed143e6ada2ee643b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-09 07:07:13 +02:00
Qt Submodule Update Bot
56a5eee34a Updated submodules.
Change-Id: I2c0f1cfb71d44eed5fb4eaacc93d931e46df9512
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-04 21:01:59 +02:00
Qt Submodule Update Bot
9b93bd0fa9 Updated submodules.
Change-Id: I2c06e806a22480919b27133b080281cad06ebf26
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-04-04 10:53:08 +02:00
Qt Submodule Update Bot
2c0f1cfb71 Updated submodules.
Change-Id: I4fadcf5d88abca2ae886dd4483ca2838bfdbce19
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-03 07:14:33 +02:00
Alex Blasche
60f5070d97 Remove qt3d from qtlocation's dependency list
QtLocation no longer depends on Qt3D.

Change-Id: I0418dcc93a97722948bddcdd4f754914d7eaa019
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
2014-04-02 12:12:44 +02:00
Qt Submodule Update Bot
2c06e806a2 Updated submodules.
Change-Id: Ib2385231c40547a3d6de2acaad978a2f5700ed36
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-02 06:54:36 +02:00
Qt Submodule Update Bot
4fadcf5d88 Updated submodules.
Change-Id: Ifb66951776e8decb8784c80fb7ed02864253065b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-04-01 19:29:23 +02:00
Qt Submodule Update Bot
fb66951776 Updated submodules.
Change-Id: I55e55c405f6e950dcc623b1f7d7faa09bc8c950f
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-28 07:34:43 +01:00
Qt Submodule Update Bot
55e55c405f Updated submodules.
Change-Id: I982ee75828244f44a1f27b4aa2d5a2a5dabbcd63
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-27 20:38:00 +01:00
Qt Submodule Update Bot
982ee75828 Updated submodules.
Change-Id: I06d2b3a720c1aa819e35ddd51c6cd5211d2748a6
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-26 07:43:18 +01:00
Qt Submodule Update Bot
06d2b3a720 Updated submodules.
Change-Id: Ib065abc7fd89c5766c5a060b295ea19154c02f64
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-22 12:56:43 +01:00
Sergio Ahumada
67400663f8 Add qtenginio#stable as part of the default modules
Also update qtenginio to the latest stable sha1.

Change-Id: Ia60a65c1a66a1b157240cc7ef519dc0c20d36567
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-03-21 13:16:20 +01:00
Qt Submodule Update Bot
b065abc7fd Updated submodules.
Change-Id: Ie045c5319823add1aeca81b2ca44ce913cac4f74
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-21 13:16:16 +01:00
Qt Submodule Update Bot
e045c53198 Updated submodules.
Change-Id: I6d47ef2b92d142bd2777a8c0d2abc4c758fbcb8b
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-19 19:52:59 +01:00
Qt Submodule Update Bot
6d47ef2b92 Updated submodules.
Change-Id: I74af16bd0da5e2dc9e5b265d26e564201cc31b78
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-18 05:42:39 +01:00
Qt Submodule Update Bot
74af16bd0d Updated submodules.
Change-Id: I556a3377ffb8348cdc2301b45c445c2f244ccf6a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-03-16 13:12:02 +01:00
Qt Submodule Update Bot
556a3377ff Updated submodules.
Change-Id: I8ce1937883833b7e66453e3764e390d0dc44b925
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-15 14:00:16 +01:00
Qt Submodule Update Bot
8ce1937883 Updated submodules.
Change-Id: Ie198c124d3259dea657fcfa4c9b9b43bcd2d9fd0
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-03-10 07:03:48 +01:00
Qt Submodule Update Bot
e198c124d3 Updated submodules.
Change-Id: I7704ce065db8050837d8bf97f8f4c1798b6d92fb
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-07 20:37:07 +01:00
Qt Submodule Update Bot
7704ce065d Updated submodules.
Change-Id: I592415857ca8c6cbd2854dd9de0a573f29842161
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-06 18:47:48 +01:00
Qt Submodule Update Bot
592415857c Updated submodules.
Change-Id: Ie169f588d85737831df044e2661484cb734b19eb
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-03-05 18:36:01 +01:00
Qt Submodule Update Bot
e169f588d8 Updated submodules.
Change-Id: I6380ce86f1f835ca6d6398fef301fbfb9748137a
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-04 11:28:56 +01:00
Qt Submodule Update Bot
6380ce86f1 Updated submodules.
Change-Id: Ied6175da93a16e2733c2dcc266761ba91f225ada
Reviewed-by: Antti Kokko <antti.kokko@digia.com>
2014-03-03 14:50:47 +01:00
Oswald Buddenhagen
9372697001 automatically install hooks
Change-Id: I2fabc610dd69730cfdac45046d4bbc6f53822fc4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-02-28 14:17:21 +01:00
Qt Submodule Update Bot
ed6175da93 Updated submodules.
Change-Id: I63200543dde700d6b0fd343800793adb6e180bad
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-28 07:07:01 +01:00
Qt Submodule Update Bot
63200543dd Updated submodules.
Change-Id: I0a23321599c73357c6f724f204b480ba7311e51a
2014-02-26 07:33:29 +02:00
Oswald Buddenhagen
4e92039103 nuke qlalr submodule
it was merged back into qtbase.

Change-Id: Ia5e6252ac13b0f821807c825eea611d484c1dd7b
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-02-22 18:22:38 +01:00
Qt Submodule Update Bot
0a23321599 Updated submodules.
Change-Id: Idc199e37d59beb8a4801a599dd5a0ff9ee2c23f8
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-21 07:16:40 +01:00
Oswald Buddenhagen
6b22ad702d remove reviewed-by template
unlike previously thought, gerrit does not remove recognized reviewers
who did not actually make a review. so better not suggest adding
potentially misleading footers.

Change-Id: I92d2833ca8888a2c2c09dfacb0cff122cad1eb15
2014-02-20 12:21:07 +01:00
Oswald Buddenhagen
a3152cb8f1 Merge remote-tracking branch 'gerrit/dev' into stable
Change-Id: I7e15ecc9ce71063757677e5c8b07e3c0167c857c
2014-02-19 16:13:02 +01:00
Qt Submodule Update Bot
dc199e37d5 Updated submodules.
Change-Id: Ife236cc44c61eab39bec31a5ac9c0647934b03af
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-17 20:44:41 +01:00
Frederik Gladhorn
a7dc6fd595 Add qtwebsockets as submodule
This just adds the module, it doesn't yet make it part of Qt 5.3
or anything like that

Change-Id: Icd42c4d2366e31298758a6ef82924bfb64a9f814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-02-17 06:32:17 +01:00
Qt Submodule Update Bot
fe236cc44c Updated submodules.
Change-Id: I7befa702530b486531fbbc2ef7ed4d3195e2ad54
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-16 08:11:37 +01:00
Qt Submodule Update Bot
b2385231c4 Updated submodules.
Change-Id: Iae9c68d190f22ef0e32546c7a3f513e9175ef3fc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-15 17:13:03 +01:00
Qt Submodule Update Bot
7befa70253 Updated submodules.
Change-Id: I805c735b027c237245a0083a1d827bb9f64c21ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-15 17:12:38 +01:00
Qt Submodule Update Bot
805c735b02 Updated submodules.
Change-Id: Ib25883ebaafe1b86077d77d5598355d1f9320a5a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-13 10:31:05 +01:00
Qt Submodule Update Bot
ae9c68d190 Updated submodules.
Change-Id: I3b525e1235e9ec27db475fac6086a884297d1634
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-10 14:03:43 +01:00
Friedemann Kleint
ef51fe0ebb Merge "Merge branch 'stable' into dev" into refs/staging/dev 2014-02-06 08:46:01 +01:00
Qt Submodule Update Bot
3b525e1235 Updated submodules.
Change-Id: If37564a74908846d69141b95c7edd938f4fc2379
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-02-05 12:46:41 +01:00
Frederik Gladhorn
76e16b228e Merge branch 'stable' into dev
Conflicts:
	qtactiveqt
	qtandroidextras
	qtbase
	qtconnectivity
	qtdeclarative
	qtdoc
	qtgraphicaleffects
	qtimageformats
	qtlocation
	qtmacextras
	qtmultimedia
	qtqa
	qtquick1
	qtquickcontrols
	qtrepotools
	qtscript
	qtsensors
	qtserialport
	qtsvg
	qttools
	qttranslations
	qtwebkit
	qtwebkit-examples
	qtwinextras
	qtx11extras
	qtxmlpatterns

Change-Id: I404135b8463e4cdfc6a235f8c2203ea8ddfa3df5
2014-01-29 13:52:49 +01:00
Oswald Buddenhagen
604f330cd2 don't unnecessarily confuse qt creator
our CONFIG+=build_pass hack has the side effect that qmake does not emit
the calling command line to the makefile, which makes creator unable to
detect the build. so revert the hack as soon as it did its deed.

Task-number: QTBUG-34788
Change-Id: I4c0fd28d661ca5049f31d5405e84525efb12fd4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-01-23 07:18:25 +01:00
Qt Submodule Update Bot
b25883ebaa Updated submodules.
Change-Id: Ia968d5d5314ac04835e90be462b1a71f8ab293e9
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-01-20 18:37:41 +01:00
Qt Submodule Update Bot
a968d5d531 Updated submodules.
Change-Id: I5fd794ca6d89ea5787cb1b7d2dcabc6f7b75776a
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-20 12:43:47 +01:00
Qt Submodule Update Bot
5fd794ca6d Updated submodules.
Change-Id: Ic8d3a71d7cf7e92224064aa989a9551ee52c9d57
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-17 09:37:44 +01:00
Alex Blasche
4b256e249b Add QtAndroidExtras to dependency list of QtConnectivity
We only need it for Android builds though.

Change-Id: I760dfd6038da2d4061326dd361ac517c9e674239
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-01-14 14:19:38 +01:00
Qt Submodule Update Bot
f37564a749 Updated submodules.
Change-Id: Ibaac9b5129cd252d65ce5896bac05e96abe6859c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-11 11:59:15 +01:00
Qt Submodule Update Bot
c8d3a71d7c Updated submodules.
Change-Id: I402457bcfbad53c6dd2214290c668ece693bbdcd
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
2014-01-10 08:49:02 +01:00
Qt Submodule Update Bot
402457bcfb Updated submodules.
Change-Id: I06d0fa240f6a0f99770e51969543608dbaf5f7e0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-09 18:00:53 +01:00
Qt Submodule Update Bot
baac9b5129 Updated submodules.
Change-Id: If7b7ff4f9fdd710ef78a953113e87393597e3e80
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-01-09 07:52:59 +01:00
Qt Submodule Update Bot
06d0fa240f Updated submodules.
Change-Id: Ia250914fecb288f82db6a7b53e70d433898eb2f4
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2014-01-02 08:10:02 +01:00
Qt Submodule Update Bot
a250914fec Updated submodules.
Change-Id: Iec0c8697aa573d7bdec000ab2e6fb0729c0793bc
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-20 06:41:46 +01:00
Qt Submodule Update Bot
f7b7ff4f9f Updated submodules.
Change-Id: Id00002337613fa6681aed81193565ed7a5a4e472
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2013-12-16 12:41:55 +01:00
Qt Submodule Update Bot
ec0c8697aa Updated submodules.
Change-Id: I7c73e564bd61faa38fdd51947f8d98c03230f104
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
2013-12-16 11:26:06 +01:00
Oswald Buddenhagen
dbac1e77f7 try to make the ChangeLog template more inviting
move it even futher up and encourage integrating it into the rest of the
commit message.

Change-Id: I5aaa417a58d420c3d3a8d5ca80dcd9f265c64829
Reviewed-by: Sergio Ahumada <sahumada@gmail.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-11-30 15:24:54 +01:00
Sergio Ahumada
4c925babf9 Merge "Merge branch 'stable' into dev" into refs/staging/dev 2013-10-16 12:39:27 +02:00
Qt Submodule Update Bot
d000023376 Updated submodules.
Change-Id: I1aa3ccbc4c789fb0ef265f88c9062b8bc591c449
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-15 20:33:49 +02:00
Sergio Ahumada
38b7c75f6b Merge branch 'stable' into dev
Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8
2013-10-15 12:13:50 +02:00
Qt Submodule Update Bot
1aa3ccbc4c Updated submodules.
Change-Id: I270009dfde0be0080902b6ea6a220ccf4095cb0e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
2013-10-14 17:52:01 +02:00
672 changed files with 28132 additions and 52790 deletions

View File

@@ -4,25 +4,28 @@
# ==[ Details: Describe what changed and explain why it changed ]======|
# ==[ Footers: Uncomment and edit where applicable ]===================|
#
# Change log entry (see below for instructions).
#[ChangeLog][][]
# ==[ Footers: Uncomment and edit where applicable ]===================|
#
# One task per entry. Remember space after colon.
# One task per entry. Add a space after the colon.
# Use Fixes to automatically close an issue, and Task-number to
# reference it without further action.
# You do not need both for the same issue.
#Fixes:
#Task-number:
#
# Solicit reviewers. They still need to use the Gerrit frontend.
#Reviewed-by:
#Coverity-Id:
#
# ==[ Please wrap at 72 characters ]===================================|
#
# Remember to read http://wiki.qt-project.org/Commit_Policy
# Remember to read http://wiki.qt.io/Commit_Policy
#
# Change log entry: If this commit adds a significant feature, fixes an
# issue or contains a behavior change that is relevant to others,
# add a change log entry. It can be multiple lines long and ends with an
# empty newline.
# empty newline. Try to integrate it into the flow of the commit message
# to avoid redundancy.
# Use the module name to indicate the area of the change e.g. [QtCore].
# Optionally specify a class or subtopic [QtNetwork][QSslSocket].
# Other common tags are: [General], [Important Behavior Changes],

3
.gitattributes vendored
View File

@@ -1,7 +1,6 @@
.tag export-subst
.gitignore export-ignore
.gitattributes export-ignore
.gitmodules export-ignore
.commit-template export-ignore
.commit-template export-ignore eol=lf
init-repository export-ignore
README.git export-ignore

1
.gitignore vendored
View File

@@ -1,3 +1,4 @@
Makefile
.qmake.cache
.qmake.super
*.pro.user*

238
.gitmodules vendored
View File

@@ -1,105 +1,307 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.12.3
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.12.3
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.12.3
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.12.3
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.12.3
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.12.3
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.12.3
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.12.3
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.12.3
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative qttools
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
path = qtdoc
url = ../qtdoc.git
[submodule "qlalr"]
path = qlalr
url = ../qlalr.git
branch = 5.12.3
status = essential
priority = 40
[submodule "qtrepotools"]
path = qtrepotools
url = ../qtrepotools.git
[submodule "qtwebkit"]
path = qtwebkit
url = ../qtwebkit.git
[submodule "qtwebkit-examples"]
path = qtwebkit-examples
url = ../qtwebkit-examples.git
branch = master
status = essential
project = -
[submodule "qtqa"]
depends = qtbase
path = qtqa
url = ../qtqa.git
branch = master
status = essential
priority = 50
[submodule "qtlocation"]
depends = qtbase
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
branch = 5.12.3
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.12.3
status = addon
[submodule "qtsystems"]
depends = qtbase
recommends = qtdeclarative
path = qtsystems
url = ../qtsystems.git
branch = dev
status = ignore
[submodule "qtfeedback"]
depends = qtdeclarative
recommends = qtmultimedia
path = qtfeedback
url = ../qtfeedback.git
branch = master
status = ignore
[submodule "qtdocgallery"]
depends = qtdeclarative
path = qtdocgallery
url = ../qtdocgallery.git
branch = master
status = ignore
[submodule "qtpim"]
depends = qtdeclarative
path = qtpim
url = ../qtpim.git
branch = dev
status = ignore
[submodule "qtconnectivity"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.12.3
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
[submodule "qtjsondb"]
path = qtjsondb
url = ../qtjsondb.git
branch = 5.12.3
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
branch = 5.12.3
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
[submodule "qtquick1"]
path = qtquick1
url = ../qtquick1.git
branch = 5.12.3
status = addon
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.12.3
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.12.3
status = addon
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.12.3
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.12.3
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.12.3
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.12.3
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.12.3
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
[submodule "qtenginio"]
path = qtenginio
url = ../qtenginio.git
branch = 5.12.3
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.12.3
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.12.3
status = addon
[submodule "qtwebengine"]
depends = qtdeclarative
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
path = qtwebengine
url = ../qtwebengine.git
branch = 5.12.3
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.12.3
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.12.3
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.12.3
status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.12.3
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.12.3
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.12.3
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.12.3
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.12.3
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.12.3
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.12.3
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.12.3
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.12.3
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.12.3
status = addon

View File

@@ -1,22 +0,0 @@
Digia Qt LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.

View File

@@ -1,674 +0,0 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

292
LICENSE.GPLv2 Normal file
View File

@@ -0,0 +1,292 @@
GNU GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt Toolkit under the terms of
GNU General Public License version 2, which is displayed below.
-------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
Preamble
The licenses for most software are designed to take away your freedom
to share and change it. By contrast, the GNU General Public License is
intended to guarantee your freedom to share and change free software
--to make sure the software is free for all its users. This General
Public License applies to most of the Free Software Foundation's
software and to any other program whose authors commit to using it.
(Some other Free Software Foundation software is covered by the GNU
Lesser General Public License instead.) You can apply it to your
programs, too.
When we speak of free software, we are referring to freedom, not price.
Our General Public Licenses are designed to make sure that you have the
freedom to distribute copies of free software (and charge for this
service if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs; and that you know you can do these things.
To protect your rights, we need to make restrictions that forbid anyone
to deny you these rights or to ask you to surrender the rights. These
restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.
For example, if you distribute copies of such a program, whether gratis
or for a fee, you must give the recipients all the rights that you
have. You must make sure that they, too, receive or can get the source
code. And you must show them these terms so they know their rights.
We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.
Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software. If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.
Finally, any free program is threatened constantly by software patents.
We wish to avoid the danger that redistributors of a free program will
individually obtain patent licenses, in effect making the program
proprietary. To prevent this, we have made it clear that any patent
must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains a
notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language. (Hereinafter, translation is included without limitation in
the term "modification".) Each licensee is addressed as "you".
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of running
the Program is not restricted, and the output from the Program is
covered only if its contents constitute a work based on the Program
(independent of having been made by running the Program). Whether that
is true depends on what the Program does.
1. You may copy and distribute verbatim copies of the Program's source
code as you receive it, in any medium, provided that you conspicuously
and appropriately publish on each copy an appropriate copyright notice
and disclaimer of warranty; keep intact all the notices that refer to
this License and to the absence of any warranty; and give any other
recipients of the Program a copy of this License along with the
Program.
You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.
2. You may modify your copy or copies of the Program or any portion of
it, thus forming a work based on the Program, and copy and distribute
such modifications or work under the terms of Section 1 above, provided
that you also meet all of these conditions:
a) You must cause the modified files to carry prominent notices
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
c) If the modified program normally reads commands interactively
when run, you must cause it, when started running for such
interactive use in the most ordinary way, to print or display an
announcement including an appropriate copyright notice and a
notice that there is no warranty (or else, saying that you provide
a warranty) and that users may redistribute the program under
these conditions, and telling the user how to view a copy of this
License. (Exception: if the Program itself is interactive but does
not normally print such an announcement, your work based on the
Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works. But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.
Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.
In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of a
storage or distribution medium does not bring the other work under the
scope of this License.
3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:
a) Accompany it with the complete corresponding machine-readable
source code, which must be distributed under the terms of Sections
1 and 2 above on a medium customarily used for software
interchange; or,
b) Accompany it with a written offer, valid for at least three
years, to give any third party, for a charge no more than your cost
of physically performing source distribution, a complete
machine-readable copy of the corresponding source code, to be
distributed under the terms of Sections 1 and 2 above on a medium
customarily used for software interchange; or,
c) Accompany it with the information you received as to the offer
to distribute corresponding source code. (This alternative is
allowed only for noncommercial distribution and only if you
received the program in object code or executable form with such
an offer, in accord with Subsection b above.)
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to control
compilation and installation of the executable. However, as a special
exception, the source code distributed need not include anything that
is normally distributed (in either source or binary form) with the
major components (compiler, kernel, and so on) of the operating system
on which the executable runs, unless that component itself accompanies
the executable.
If distribution of executable or object code is made by offering access
to copy from a designated place, then offering equivalent access to
copy the source code from the same place counts as distribution of the
source code, even though third parties are not compelled to copy the
source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt otherwise
to copy, modify, sublicense or distribute the Program is void, and will
automatically terminate your rights under this License. However,
parties who have received copies, or rights, from you under this License
will not have their licenses terminated so long as such parties remain
in full compliance.
5. You are not required to accept this License, since you have not
signed it. However, nothing else grants you permission to modify or
distribute the Program or its derivative works. These actions are
prohibited by law if you do not accept this License. Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.
6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions. You may not impose any further restrictions
on the recipients' exercise of the rights granted herein. You are not
responsible for enforcing compliance by third parties to this License.
7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all. For example, if a patent license
would not permit royalty-free redistribution of the Program by all
those who receive copies directly or indirectly through you, then the
only way you could satisfy both it and this License would be to refrain
entirely from distribution of the Program.
If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices. Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License may
add an explicit geographical distribution limitation excluding those
countries, so that distribution is permitted only in or among countries
not thus excluded. In such case, this License incorporates the limitation
as if written in the body of this License.
9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail
to address new problems or concerns.
Each version is given a distinguishing version number. If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation. If the Program does not specify a version
number of this License, you may choose any version ever published by
the Free Software Foundation.
10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the
author to ask for permission. For software which is copyrighted by
the Free Software Foundation, write to the Free Software Foundation;
we sometimes make exceptions for this. Our decision will be guided by
the two goals of preserving the free status of all derivatives of our
free software and of promoting the sharing and reuse of software
generally.
NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND,
EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE
ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH
YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
NECESSARY SERVICING, REPAIR OR CORRECTION.
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE
TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS

View File

@@ -1,3 +1,15 @@
GNU GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt Toolkit under the terms of
GNU Lesser General Public License version 3. That license references
the General Public License version 3, that is displayed below. Other
portions of the Qt Toolkit may be licensed directly under this license.
-------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

View File

@@ -1,15 +1,15 @@
GNU LESSER GENERAL PUBLIC LICENSE
GNU LESSER GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
Contact: http://www.qt-project.org/legal
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt GUI Toolkit under the terms of
You may use, distribute and copy the Qt Toolkit under the terms of
GNU Lesser General Public License version 2.1, which is displayed below.
-------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -20,7 +20,7 @@
as the successor of the GNU Library Public License, version 2, hence
the version number 2.1.]
Preamble
Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -122,8 +122,8 @@ modification follow. Pay close attention to the difference between a
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
@@ -156,7 +156,7 @@ such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
@@ -442,7 +442,7 @@ decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.
NO WARRANTY
NO WARRANTY
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -465,7 +465,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Libraries

175
LICENSE.LGPLv3 Normal file
View File

@@ -0,0 +1,175 @@
GNU LESSER GENERAL PUBLIC LICENSE
The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd.
Contact: http://www.qt.io/licensing/
You may use, distribute and copy the Qt Toolkit under the terms of
GNU Lesser General Public License version 3, which is displayed below.
This license makes reference to the version 3 of the GNU General
Public License, which you can find in the LICENSE.GPLv3 file.
-------------------------------------------------------------------------
GNU LESSER GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies of this
licensedocument, but changing it is not allowed.
This version of the GNU Lesser General Public License incorporates
the terms and conditions of version 3 of the GNU General Public
License, supplemented by the additional permissions listed below.
0. Additional Definitions.
As used herein, “this License” refers to version 3 of the GNU Lesser
General Public License, and the “GNU GPL” refers to version 3 of the
GNU General Public License.
“The Library” refers to a covered work governed by this License,
other than an Application or a Combined Work as defined below.
An “Application” is any work that makes use of an interface provided
by the Library, but which is not otherwise based on the Library.
Defining a subclass of a class defined by the Library is deemed a mode
of using an interface provided by the Library.
A “Combined Work” is a work produced by combining or linking an
Application with the Library. The particular version of the Library
with which the Combined Work was made is also called the “Linked
Version”.
The “Minimal Corresponding Source” for a Combined Work means the
Corresponding Source for the Combined Work, excluding any source code
for portions of the Combined Work that, considered in isolation, are
based on the Application, and not on the Linked Version.
The “Corresponding Application Code” for a Combined Work means the
object code and/or source code for the Application, including any data
and utility programs needed for reproducing the Combined Work from the
Application, but excluding the System Libraries of the Combined Work.
1. Exception to Section 3 of the GNU GPL.
You may convey a covered work under sections 3 and 4 of this License
without being bound by section 3 of the GNU GPL.
2. Conveying Modified Versions.
If you modify a copy of the Library, and, in your modifications, a
facility refers to a function or data to be supplied by an Application
that uses the facility (other than as an argument passed when the
facility is invoked), then you may convey a copy of the modified
version:
a) under this License, provided that you make a good faith effort
to ensure that, in the event an Application does not supply the
function or data, the facility still operates, and performs
whatever part of its purpose remains meaningful, or
b) under the GNU GPL, with none of the additional permissions of
this License applicable to that copy.
3. Object Code Incorporating Material from Library Header Files.
The object code form of an Application may incorporate material from
a header file that is part of the Library. You may convey such object
code under terms of your choice, provided that, if the incorporated
material is not limited to numerical parameters, data structure
layouts and accessors, or small macros, inline functions and templates
(ten or fewer lines in length), you do both of the following:
a) Give prominent notice with each copy of the object code that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the object code with a copy of the GNU GPL and this
license document.
4. Combined Works.
You may convey a Combined Work under terms of your choice that, taken
together, effectively do not restrict modification of the portions of
the Library contained in the Combined Work and reverse engineering for
debugging such modifications, if you also do each of the following:
a) Give prominent notice with each copy of the Combined Work that
the Library is used in it and that the Library and its use are
covered by this License.
b) Accompany the Combined Work with a copy of the GNU GPL and this
license document.
c) For a Combined Work that displays copyright notices during
execution, include the copyright notice for the Library among
these notices, as well as a reference directing the user to the
copies of the GNU GPL and this license document.
d) Do one of the following:
0) Convey the Minimal Corresponding Source under the terms of
this License, and the Corresponding Application Code in a form
suitable for, and under terms that permit, the user to
recombine or relink the Application with a modified version of
the Linked Version to produce a modified Combined Work, in the
manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.
1) Use a suitable shared library mechanism for linking with
the Library. A suitable mechanism is one that (a) uses at run
time a copy of the Library already present on the user's
computer system, and (b) will operate properly with a modified
version of the Library that is interface-compatible with the
Linked Version.
e) Provide Installation Information, but only if you would
otherwise be required to provide such information under section 6
of the GNU GPL, and only to the extent that such information is
necessary to install and execute a modified version of the
Combined Work produced by recombining or relinking the Application
with a modified version of the Linked Version. (If you use option
4d0, the Installation Information must accompany the Minimal
Corresponding Source and Corresponding Application Code. If you
use option 4d1, you must provide the Installation Information in
the manner specified by section 6 of the GNU GPL for conveying
Corresponding Source.)
5. Combined Libraries.
You may place library facilities that are a work based on the Library
side by side in a single library together with other library
facilities that are not Applications and are not covered by this
License, and convey such a combined library under terms of your
choice, if you do both of the following:
a) Accompany the combined library with a copy of the same work
based on the Library, uncombined with any other library
facilities, conveyed under the terms of this License.
b) Give prominent notice with the combined library that part of
it is a work based on the Library, and explaining where to find
the accompanying uncombined form of the same work.
6. Revised Versions of the GNU Lesser General Public License.
The Free Software Foundation may publish revised and/or new versions
of the GNU Lesser General Public License from time to time. Such new
versions will be similar in spirit to the present version, but may
differ in detail to address new problems or concerns.
Each version is given a distinguishing version number. If the Library
as you received it specifies that a certain numbered version of the
GNU Lesser General Public License “or any later version” applies to
it, you have the option of following the terms and conditions either
of that published version or of any later version published by the
Free Software Foundation. If the Library as you received it does not
specify a version number of the GNU Lesser General Public License,
you may choose any version of the GNU Lesser General Public License
ever published by the Free Software Foundation.
If the Library as you received it specifies that a proxy can decide
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the Library.

View File

@@ -1,628 +0,0 @@
TECHNOLOGY PREVIEW LICENSE AGREEMENT
For individuals and/or legal entities resident in the Americas (North
America, Central America and South America), the applicable licensing
terms are specified under the heading "Technology Preview License
Agreement: The Americas".
For individuals and/or legal entities not resident in The Americas, the
applicable licensing terms are specified under the heading "Technology
Preview License Agreement: Rest of the World".
TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
Agreement version 2.4
This Technology Preview License Agreement ("Agreement")is a legal agreement
between Digia USA, Inc. ("Digia"), with its registered office at 2350
Mission College Blvd., Suite 1020, Santa Clara, California 95054,
U.S.A. and you (either an individual or a legal entity) ("Licensee") for the
Licensed Software (as defined below).
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct
or indirect ownership or control as such Party; or (iii) which is
directly or indirectly owned or controlled by such Party. For these
purposes, an entity shall be treated as being controlled by another if
that other entity has fifty percent (50 %) or more of the votes in such
entity, is able to direct its affairs and/or to control the composition
of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
"Term" shall mean the period of time six (6) months from the later of
(a) the Effective Date; or (b) the date the Licensed Software was
initially delivered to Licensee by Digia. If no specific Effective Date
is set forth in the Agreement, the Effective Date shall be deemed to be
the date the Licensed Software was initially delivered to Licensee.
"Licensed Software" shall mean the computer software, "online" or
electronic documentation, associated media and printed materials,
including the source code, example programs and the documentation
delivered by Digia to Licensee in conjunction with this Agreement.
"Party" or "Parties" shall mean Licensee and/or Digia.
2. OWNERSHIP
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and
treaties. The Licensed Software is licensed, not sold.
If Licensee provides any findings, proposals, suggestions or other
feedback ("Feedback") to Digia regarding the Licensed Software, Digia
shall own all right, title and interest including the intellectual
property rights in and to such Feedback, excluding however any existing
patent rights of Licensee. To the extent Licensee owns or controls any
patents for such Feedback Licensee hereby grants to Digia and its
Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
royalty-free license to (i) use, copy and modify Feedback and to create
derivative works thereof, (ii) to make (and have made), use, import,
sell, offer for sale, lease, dispose, offer for disposal or otherwise
exploit any products or services of Digia containing Feedback, and
(iii) sublicense all the foregoing rights to third party licensees and
customers of Digia and/or its Affiliates.
3. VALIDITY OF THE AGREEMENT
By installing, copying, or otherwise using the Licensed Software,
Licensee agrees to be bound by the terms of this Agreement. If Licensee
does not agree to the terms of this Agreement, Licensee may not install,
copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
of the terms and conditions of this Agreement, Digia grants Licensee the
right to use the Licensed Software in the manner provided below.
4. LICENSES
4.1. Using and Copying
Digia grants to Licensee a non-exclusive, non-transferable, time-limited
license to use and copy the Licensed Software for sole purpose of
designing, developing and testing Applications, and evaluating and the
Licensed Software during the Term.
Licensee may install copies of the Licensed Software on an unlimited
number of computers provided that (a) if an individual, only such
individual; or (b) if a legal entity only its employees; use the
Licensed Software for the authorized purposes.
4.2 No Distribution or Modifications
Licensee may not disclose, modify, sell, market, commercialise,
distribute, loan, rent, lease, or license the Licensed Software or any
copy of it or use the Licensed Software for any purpose that is not
expressly granted in this Section 4. Licensee may not alter or remove
any details of ownership, copyright, trademark or other property right
connected with the Licensed Software. Licensee may not distribute any
software statically or dynamically linked with the Licensed Software.
4.3 No Technical Support
Digia has no obligation to furnish Licensee with any technical support
whatsoever. Any such support is subject to separate agreement between
the Parties.
5. PRE-RELEASE CODE
The Licensed Software contains pre-release code that is not at the level
of performance and compatibility of a final, generally available,
product offering. The Licensed Software may not operate correctly and
may be substantially modified prior to the first commercial product
release, if any. Digia is not obligated to make this or any later
version of the Licensed Software commercially available. The License
Software is "Not for Commercial Use" and may only be used for the
purposes described in Section 4. The Licensed Software may not be used
in a live operating environment where it may be relied upon to perform
in the same manner as a commercially released product or with data that
has not been sufficiently backed up.
6. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions.
Third Party Software does not comprise part of the Licensed Software. In
some cases, access to Third Party Software may be included along with
the Licensed Software delivery as a convenience for development and
testing only. Such source code and libraries may be listed in the
".../src/3rdparty" source tree delivered with the Licensed Software or
documented in the Licensed Software where the Third Party Software is
used, as may be amended from time to time, do not comprise the Licensed
Software. Licensee acknowledges (1) that some part of Third Party
Software may require additional licensing of copyright and patents from
the owners of such, and (2) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Licensed Software is licensed to Licensee "as is". To the maximum
extent permitted by applicable law, Digia on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or
implied, including, but not limited to, implied warranties of
merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
8. LIMITATION OF LIABILITY
If, Digia's warranty disclaimer notwithstanding, Digia is held liable to
Licensee, whether in contract, tort or any other legal theory, based on
the Licensed Software, Digia's entire liability to Licensee and
Licensee's exclusive remedy shall be, at Digia's option, either (A)
return of the price Licensee paid for the Licensed Software, or (B)
repair or replacement of the Licensed Software, provided Licensee
returns to Digia all copies of the Licensed Software as originally
delivered to Licensee. Digia shall not under any circumstances be liable
to Licensee based on failure of the Licensed Software if the failure
resulted from accident, abuse or misapplication, nor shall Digia under
any circumstances be liable for special damages, punitive or exemplary
damages, damages for loss of profits or interruption of business or for
loss or corruption of data. Any award of damages from Digia to Licensee
shall not exceed the total amount Licensee has paid to Digia in
connection with this Agreement.
9. CONFIDENTIALITY
Each party acknowledges that during the Term of this Agreement it shall
have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and
other information, including the terms of this Agreement, that is
confidential and of great value to the other party, and the value of
which would be significantly reduced if disclosed to third parties (the
"Confidential Information"). Accordingly, when a party (the "Receiving
Party") receives Confidential Information from another party (the
"Disclosing Party"), the Receiving Party shall, and shall obligate its
employees and agents and employees and agents of its Affiliates to: (i)
maintain the Confidential Information in strict confidence; (ii) not
disclose the Confidential Information to a third party without the
Disclosing Party's prior written approval; and (iii) not, directly or
indirectly, use the Confidential Information for any purpose other than
for exercising its rights and fulfilling its responsibilities pursuant
to this Agreement. Each party shall take reasonable measures to protect
the Confidential Information of the other party, which measures shall
not be less than the measures taken by such party to protect its own
confidential and proprietary information.
"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession
prior to the disclosure hereunder and was not subject to limitations on
disclosure or use; (c) is developed by the Receiving Party without
access to the Confidential Information of the Disclosing Party or by
persons who have not had access to the Confidential Information of the
Disclosing Party as proven by the written records of the Receiving
Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of
confidentiality; or (e) the Receiving Party is legally compelled to
disclose the information, in which case the Receiving Party shall assert
the privileged and confidential nature of the information and cooperate
fully with the Disclosing Party to protect against and prevent
disclosure of any Confidential Information and to limit the scope of
disclosure and the dissemination of disclosed Confidential Information
by all legally available means.
The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after
expiration or termination of this Agreement. To the extent that the
terms of the Non-Disclosure Agreement between Digia and Licensee
conflict with the terms of this Section 9, this Section 9 shall be
controlling over the terms of the Non-Disclosure Agreement.
10. GENERAL PROVISIONS
10.1 No Assignment
Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior
written consent of Digia, which shall not be unreasonably withheld.
10.2 Termination
Digia may terminate the Agreement at any time immediately upon written
notice by Digia to Licensee if Licensee breaches this Agreement.
Upon termination of this Agreement, Licensee shall return to Digia all
copies of Licensed Software that were supplied by Digia. All other
copies of Licensed Software in the possession or control of Licensee
must be erased or destroyed. An officer of Licensee must promptly
deliver to Digia a written confirmation that this has occurred.
10.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably
should survive a cancellation or termination of this Agreement shall
also be deemed to survive. Such terms and conditions include, but are
not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
10.5, 10.6, 10.7, and 10.8 of this Agreement.
10.4 Entire Agreement
This Agreement constitutes the complete agreement between the parties
and supersedes all prior or contemporaneous discussions,
representations, and proposals, written or oral, with respect to the
subject matters discussed herein, with the exception of the
non-disclosure agreement executed by the parties in connection with this
Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
Section 9. No modification of this Agreement shall be effective unless
contained in a writing executed by an authorized representative of each
party. No term or condition contained in Licensee's purchase order shall
apply unless expressly accepted by Digia in writing. If any provision of
the Agreement is found void or unenforceable, the remainder shall remain
valid and enforceable according to its terms. If any remedy provided is
determined to have failed for its essential purpose, all limitations of
liability and exclusions of damages set forth in this Agreement shall
remain in effect.
10.5 Export Control
Licensee acknowledges that the Licensed Software may be subject to
export control restrictions of various countries. Licensee shall fully
comply with all applicable export license restrictions and requirements
as well as with all laws and regulations relating to the importation of
the Licensed Software and shall procure all necessary governmental
authorizations, including without limitation, all necessary licenses,
approvals, permissions or consents, where necessary for the
re-exportation of the Licensed Software.,
10.6 Governing Law and Legal Venue
This Agreement shall be governed by and construed in accordance with the
federal laws of the United States of America and the internal laws of
the State of New York without given effect to any choice of law rule
that would result in the application of the laws of any other
jurisdiction. The United Nations Convention on Contracts for the
International Sale of Goods (CISG) shall not apply. Each Party (a)
hereby irrevocably submits itself to and consents to the jurisdiction of
the United States District Court for the Southern District of New York
(or if such court lacks jurisdiction, the state courts of the State of
New York) for the purposes of any action, claim, suit or proceeding
between the Parties in connection with any controversy, claim, or
dispute arising out of or relating to this Agreement; and (b) hereby
waives, and agrees not to assert by way of motion, as a defense or
otherwise, in any such action, claim, suit or proceeding, any claim that
is not personally subject to the jurisdiction of such court(s), that the
action, claim, suit or proceeding is brought in an inconvenient forum or
that the venue of the action, claim, suit or proceeding is improper.
Notwithstanding the foregoing, nothing in this Section 9.6 is intended
to, or shall be deemed to, constitute a submission or consent to, or
selection of, jurisdiction, forum or venue for any action for patent
infringement, whether or not such action relates to this Agreement.
10.7 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder,
shall remain with Digia and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with
any other software or hardware not delivered by Digia under this
Agreement.
10.8 Government End Users
A "U.S. Government End User" shall mean any agency or entity of the
government of the United States. The following shall apply if Licensee
is a U.S. Government End User. The Licensed Software is a "commercial
item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
consisting of "commercial computer software" and "commercial computer
software documentation," as such terms are used in 48 C.F.R. 12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
through 227.7202-4 (June 1995), all U.S. Government End Users acquire
the Licensed Software with only those rights set forth herein. The
Licensed Software (including related documentation) is provided to U.S.
Government End Users: (a) only as a commercial end item; and (b) only
pursuant to this Agreement.
TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World
Agreement version 2.4
This Technology Preview License Agreement ("Agreement") is a legal
agreement between Digia Finland Ltd ("Digia"), with its registered office at
Valimotie 21,FI-00380 Helsinki, Finland and you (either an individual or a
legal entity) ("Licensee") for the Licensed Software.
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct
or indirect ownership or control as such Party; or (iii) which is
directly or indirectly owned or controlled by such Party. For these
purposes, an entity shall be treated as being controlled by another if
that other entity has fifty percent (50 %) or more of the votes in such
entity, is able to direct its affairs and/or to control the composition
of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
"Term" shall mean the period of time six (6) months from the later of
(a) the Effective Date; or (b) the date the Licensed Software was
initially delivered to Licensee by Digia. If no specific Effective Date
is set forth in the Agreement, the Effective Date shall be deemed to be
the date the Licensed Software was initially delivered to Licensee.
"Licensed Software" shall mean the computer software, "online" or
electronic documentation, associated media and printed materials,
including the source code, example programs and the documentation
delivered by Digia to Licensee in conjunction with this Agreement.
"Party" or "Parties" shall mean Licensee and/or Digia.
2. OWNERSHIP
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and
treaties. The Licensed Software is licensed, not sold.
If Licensee provides any findings, proposals, suggestions or other
feedback ("Feedback") to Digia regarding the Licensed Software, Digia
shall own all right, title and interest including the intellectual
property rights in and to such Feedback, excluding however any existing
patent rights of Licensee. To the extent Licensee owns or controls any
patents for such Feedback Licensee hereby grants to Digia and its
Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
royalty-free license to (i) use, copy and modify Feedback and to create
derivative works thereof, (ii) to make (and have made), use, import,
sell, offer for sale, lease, dispose, offer for disposal or otherwise
exploit any products or services of Digia containing Feedback, and
(iii) sublicense all the foregoing rights to third party licensees and
customers of Digia and/or its Affiliates.
3. VALIDITY OF THE AGREEMENT
By installing, copying, or otherwise using the Licensed Software,
Licensee agrees to be bound by the terms of this Agreement. If Licensee
does not agree to the terms of this Agreement, Licensee may not install,
copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
of the terms and conditions of this Agreement, Digia grants Licensee the
right to use the Licensed Software in the manner provided below.
4. LICENSES
4.1. Using and Copying
Digia grants to Licensee a non-exclusive, non-transferable, time-limited
license to use and copy the Licensed Software for sole purpose of
designing, developing and testing Applications, and evaluating and the
Licensed Software during the Term.
Licensee may install copies of the Licensed Software on an unlimited
number of computers provided that (a) if an individual, only such
individual; or (b) if a legal entity only its employees; use the
Licensed Software for the authorized purposes.
4.2 No Distribution or Modifications
Licensee may not disclose, modify, sell, market, commercialise,
distribute, loan, rent, lease, or license the Licensed Software or any
copy of it or use the Licensed Software for any purpose that is not
expressly granted in this Section 4. Licensee may not alter or remove
any details of ownership, copyright, trademark or other property right
connected with the Licensed Software. Licensee may not distribute any
software statically or dynamically linked with the Licensed Software.
4.3 No Technical Support
Digia has no obligation to furnish Licensee with any technical support
whatsoever. Any such support is subject to separate agreement between
the Parties.
5. PRE-RELEASE CODE
The Licensed Software contains pre-release code that is not at the level
of performance and compatibility of a final, generally available,
product offering. The Licensed Software may not operate correctly and
may be substantially modified prior to the first commercial product
release, if any. Digia is not obligated to make this or any later
version of the Licensed Software commercially available. The License
Software is "Not for Commercial Use" and may only be used for the
purposes described in Section 4. The Licensed Software may not be used
in a live operating environment where it may be relied upon to perform
in the same manner as a commercially released product or with data that
has not been sufficiently backed up.
6. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions.
Third Party Software does not comprise part of the Licensed Software. In
some cases, access to Third Party Software may be included along with
the Licensed Software delivery as a convenience for development and
testing only. Such source code and libraries may be listed in the
".../src/3rdparty" source tree delivered with the Licensed Software or
documented in the Licensed Software where the Third Party Software is
used, as may be amended from time to time, do not comprise the Licensed
Software. Licensee acknowledges (1) that some part of Third Party
Software may require additional licensing of copyright and patents from
the owners of such, and (2) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Licensed Software is licensed to Licensee "as is". To the maximum
extent permitted by applicable law, Digia on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or
implied, including, but not limited to, implied warranties of
merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
8. LIMITATION OF LIABILITY
If, Digia's warranty disclaimer notwithstanding, Digia is held liable to
Licensee, whether in contract, tort or any other legal theory, based on
the Licensed Software, Digia's entire liability to Licensee and
Licensee's exclusive remedy shall be, at Digia's option, either (A)
return of the price Licensee paid for the Licensed Software, or (B)
repair or replacement of the Licensed Software, provided Licensee
returns to Digia all copies of the Licensed Software as originally
delivered to Licensee. Digia shall not under any circumstances be liable
to Licensee based on failure of the Licensed Software if the failure
resulted from accident, abuse or misapplication, nor shall Digia under
any circumstances be liable for special damages, punitive or exemplary
damages, damages for loss of profits or interruption of business or for
loss or corruption of data. Any award of damages from Digia to Licensee
shall not exceed the total amount Licensee has paid to Digia in
connection with this Agreement.
9. CONFIDENTIALITY
Each party acknowledges that during the Term of this Agreement it shall
have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and
other information, including the terms of this Agreement, that is
confidential and of great value to the other party, and the value of
which would be significantly reduced if disclosed to third parties (the
"Confidential Information"). Accordingly, when a party (the "Receiving
Party") receives Confidential Information from another party (the
"Disclosing Party"), the Receiving Party shall, and shall obligate its
employees and agents and employees and agents of its Affiliates to: (i)
maintain the Confidential Information in strict confidence; (ii) not
disclose the Confidential Information to a third party without the
Disclosing Party's prior written approval; and (iii) not, directly or
indirectly, use the Confidential Information for any purpose other than
for exercising its rights and fulfilling its responsibilities pursuant
to this Agreement. Each party shall take reasonable measures to protect
the Confidential Information of the other party, which measures shall
not be less than the measures taken by such party to protect its own
confidential and proprietary information.
"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession
prior to the disclosure hereunder and was not subject to limitations on
disclosure or use; (c) is developed by the Receiving Party without
access to the Confidential Information of the Disclosing Party or by
persons who have not had access to the Confidential Information of the
Disclosing Party as proven by the written records of the Receiving
Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of
confidentiality; or (e) the Receiving Party is legally compelled to
disclose the information, in which case the Receiving Party shall assert
the privileged and confidential nature of the information and cooperate
fully with the Disclosing Party to protect against and prevent
disclosure of any Confidential Information and to limit the scope of
disclosure and the dissemination of disclosed Confidential Information
by all legally available means.
The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after
expiration or termination of this Agreement. To the extent that the
terms of the Non-Disclosure Agreement between Digia and Licensee
conflict with the terms of this Section 9, this Section 9 shall be
controlling over the terms of the Non-Disclosure Agreement.
10. GENERAL PROVISIONS
10.1 No Assignment
Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior
written consent of Digia, which shall not be unreasonably withheld.
10.2 Termination
Digia may terminate the Agreement at any time immediately upon written
notice by Digia to Licensee if Licensee breaches this Agreement.
Upon termination of this Agreement, Licensee shall return to Digia all
copies of Licensed Software that were supplied by Digia. All other
copies of Licensed Software in the possession or control of Licensee
must be erased or destroyed. An officer of Licensee must promptly
deliver to Digia a written confirmation that this has occurred.
10.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably
should survive a cancellation or termination of this Agreement shall
also be deemed to survive. Such terms and conditions include, but are
not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
10.5, 10.6, 10.7, and 10.8 of this Agreement.
10.4 Entire Agreement
This Agreement constitutes the complete agreement between the parties
and supersedes all prior or contemporaneous discussions,
representations, and proposals, written or oral, with respect to the
subject matters discussed herein, with the exception of the
non-disclosure agreement executed by the parties in connection with this
Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
Section 9. No modification of this Agreement shall be effective unless
contained in a writing executed by an authorized representative of each
party. No term or condition contained in Licensee's purchase order shall
apply unless expressly accepted by Digia in writing. If any provision of
the Agreement is found void or unenforceable, the remainder shall remain
valid and enforceable according to its terms. If any remedy provided is
determined to have failed for its essential purpose, all limitations of
liability and exclusions of damages set forth in this Agreement shall
remain in effect.
10.5 Export Control
Licensee acknowledges that the Licensed Software may be subject to
export control restrictions of various countries. Licensee shall fully
comply with all applicable export license restrictions and requirements
as well as with all laws and regulations relating to the importation of
the Licensed Software and shall procure all necessary governmental
authorizations, including without limitation, all necessary licenses,
approvals, permissions or consents, where necessary for the
re-exportation of the Licensed Software.,
10.6 Governing Law and Legal Venue
This Agreement shall be construed and interpreted in accordance with the
laws of Finland, excluding its choice of law provisions. Any disputes
arising out of or relating to this Agreement shall be resolved in
arbitration under the Rules of Arbitration of the Chamber of Commerce of
Helsinki, Finland. The arbitration tribunal shall consist of one (1), or
if either Party so requires, of three (3), arbitrators. The award shall
be final and binding and enforceable in any court of competent
jurisdiction. The arbitration shall be held in Helsinki, Finland and the
process shall be conducted in the English language.
10.7 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder,
shall remain with Digia and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with
any other software or hardware not delivered by Digia under this
Agreement.
10.8 Government End Users
A "U.S. Government End User" shall mean any agency or entity of the
government of the United States. The following shall apply if Licensee
is a U.S. Government End User. The Licensed Software is a "commercial
item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
consisting of "commercial computer software" and "commercial computer
software documentation," as such terms are used in 48 C.F.R. 12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
through 227.7202-4 (June 1995), all U.S. Government End Users acquire
the Licensed Software with only those rights set forth herein. The
Licensed Software (including related documentation) is provided to U.S.
Government End Users: (a) only as a commercial end item; and (b) only
pursuant to this Agreement.

View File

@@ -0,0 +1,913 @@
QT LICENSE AGREEMENT
Agreement version 4.0
This License Agreement ("Agreement") is a legal agreement between The Qt
Company (as defined below) and the Licensee (as defined below) for the license
of Licensed Software (as defined below). Capitalized terms used herein are
defined in Section 1.
WHEREAS:
(A). Licensee wishes to use the Licensed Software for the purpose of developing
and distributing Applications and/or Devices; and
(B). The Qt Company is willing to grant the Licensee a right to use Licensed
Software for such purpose pursuant to term and conditions of this Agreement.
NOW, THEREFORE, THE PARTIES HEREBY AGREE AS FOLLOWS:
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or indirectly
controlling such Party; (ii) which is under the same direct or indirect
ownership or control as such Party; or (iii) which is directly or indirectly
owned or controlled by such Party. For these purposes, an entity shall be
treated as being controlled by another if that other entity has fifty percent
(50 %) or more of the votes in such entity, is able to direct its affairs
and/or to control the composition of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software, which may include the Redistributables, or part
thereof.
"Contractor(s)" shall mean third party consultants, distributors and
contractors performing services to a Party under applicable contractual
arrangement.
"Customer(s)" shall mean Licensee's end users to whom Licensee, directly or
indirectly, distributes copies of the Redistributables.
"Deployment Platforms" shall mean operating systems specified in the License
Certificate, in which the Redistributables can be distributed pursuant to the
terms and conditions of this Agreement.
"Designated User(s)" shall mean the employee(s) of Licensee or Licensee's
Affiliates acting within the scope of their employment or Licensee's
Contractors acting within the scope of their services for Licensee and on
behalf of Licensee. Designated Users shall be named in the License Certificate.
"Development License" shall mean the license needed by the Licensee for each
Designated User to use the Licensed Software under the license grant described
in Section 3.1 of this Agreement.
"Development Platforms" shall mean those operating systems specified in the
License Certificate, in which the Licensed Software can be used under the
Development License, but not distributed in any form or used for any other
purpose.
"Devices" shall mean hardware devices or products that 1) are manufactured
and/or distributed by the Licensee or its Affiliates or Contractors, and
(2)(i) incorporate or integrate the Redistributables or parts thereof; or (ii)
do not incorporate or integrate the Redistributables at the time of
distribution, but where, when used by a Customer, the main user interface or
substantial functionality of such device is provided by Application(s) or
otherwise depends on the Licensed Software.
"Distribution License(s)" shall mean the license required for distribution of
Redistributables in connection with Devices pursuant to license grant described
in Section 3.3 of this Agreement.
"Distribution License Packs" shall mean set of prepaid Distribution Licenses
for distribution of Redistributables, as defined in The Qt Company's standard
price list, quote, Purchase Order confirmation or in an appendix hereto,
as the case may be.
"Intellectual Property Rights" shall mean patents (including utility models),
design patents, and designs (whether or not capable of registration), chip
topography rights and other like protection, copyrights, trademarks, service
marks, trade names, logos or other words or symbols and any other form of
statutory protection of any kind and applications for any of the foregoing as
well as any trade secrets.
"License Certificate" shall mean a certificate generated by The Qt Company for
each Designated User respectively upon them downloading the licensed Software.
License Certificate will be available under respective Designated User's Qt
Account at account.qt.io and it will specify the Designated User, the
Development Platforms, Deployment Platforms and the License Term. The terms of
the License Certificate are considered part of this Agreement and shall be
updated from time to time to reflect any agreed changes to the foregoing terms
relating to Designated User's rights to the Licensed Software.
"License Fee" shall mean the fee charged to the Licensee for rights granted
under the terms of this Agreement.
"License Term" shall mean the agreed validity period of the Development
License of the respective Designated User, during which time the
Designated User is entitled to use the Licensed Software, as set forth in the
respective License Certificate.
"Licensed Software" shall mean all versions of the
(i) Qt Toolkit (including Qt Essentials, Qt Add-Ons and Value-Add modules) as
described in http://doc.qt.io/qt-5/qtmodules.html,
(ii) Qt Creator (including Creator IDE tool) as described in
http://doc.qt.io/qtcreator/index.html,
(iii) Qt 3D Studio as described in http://doc.qt.io/qt3dstudio/index.html, and
as well as corresponding online or electronic documentation, associated media
and printed materials, including the source code, example programs and the
documentation, licensed to the Licensee under this Agreement. Licensed Software
does not include Third Party Software (as defined in Section 4), Open Source
Qt, or other software products of The Qt Company (for example Qt Safe Renderer
and Qt for Automation), unless such other software products of The Qt Company
are separately agreed in writing to be included in scope of the Licensed
Software.
"Licensee" shall mean the individual or legal entity that is party to this
Agreement, as identified on the signature page hereof.
"Licensee's Records" shall mean books and records that are likely to contain
information bearing on Licensee's compliance with this Agreement or the
payments due to The Qt Company under this Agreement, including, but not limited
to: assembly logs, sales records and distribution records.
"Modified Software" shall have the meaning as set forth in Section 2.3.
"Online Services" shall mean any services or access to systems made available
by The Qt Company to the Licensee over the Internet relating to the Licensed
Software or for the purpose of use by the Licensee of the Licensed Software or
Support. Use of any such Online Services is discretionary for the Licensee and
some of them may be subject to additional fees.
"Open Source Qt" shall mean the non-commercial Qt computer software products,
licensed under the terms of the GNU Lesser General Public License, version
2.1 or later ("LGPL") or the GNU General Public License, version 2.0 or later
("GPL"). For clarity, Open Source Qt shall not be provided nor governed under
this Agreement.
"Party" or "Parties" shall mean Licensee and/or The Qt Company.
"Redistributables" shall mean the portions of the Licensed Software set forth
in Appendix 1, Section 1 that may be distributed pursuant to the terms of this
Agreement in object code form only, including any relevant documentation.
Where relevant, any reference to Licensed Software in this Agreement shall
include and refer also to Redistributables.
"Renewal Term" shall mean an extension of previous License Term as agreed
between the Parties.
"Submitted Modified Software" shall have the meaning as set forth in
Section 2.3.
"Support" shall mean standard developer support that is provided by The Qt
Company to assist Designated Users in using the Licensed Software in
accordance with The Qt Company's standard support terms and as further
defined in Section 8 hereunder.
"Taxes" shall have the meaning set forth in Section 10.5.
"Term" shall have the meaning set forth in Section 12.
"The Qt Company" shall mean:
(i) in the event Licensee is an individual residing in the United States or a
legal entity incorporated in the United States or having its headquarters in
the United States, The Qt Company Inc., a Delaware corporation with its office
at 2350 Mission College Blvd., Suite 1020, Santa Clara, CA 95054, USA.; or
(ii) in the event the Licensee is an individual residing outside of the United
States or a legal entity incorporated outside of the United States or having
its registered office outside of the United States, The Qt Company Ltd., a
Finnish company with its registered office at Bertel Jungin aukio D3A, 02600
Espoo, Finland.
"Third Party Software " shall have the meaning set forth in Section 4.
"Updates" shall mean a release or version of the Licensed Software containing
bug fixes, error corrections and other changes that are generally made
available to users of the Licensed Software that have contracted for Support.
Updates are generally depicted as a change to the digits following the decimal
in the Licensed Software version number. The Qt Company shall make Updates
available to the Licensee under the Support. Updates shall be considered as
part of the Licensed Software hereunder.
"Upgrades" shall mean a release or version of the Licensed Software containing
enhancements and new features and are generally depicted as a change to the
first digit of the Licensed Software version number. In the event Upgrades are
provided to the Licensee under this Agreement, they shall be considered as
part of the Licensed Software hereunder.
2. OWNERSHIP
2.1 Ownership of The Qt Company
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and treaties.
The Licensed Software is licensed, not sold.
All The Qt Company's Intellectual Property Rights are and shall remain the
exclusive property of The Qt Company or its licensors respectively.
2.2 Ownership of Licensee
All the Licensee's Intellectual Property Rights are and shall remain the
exclusive property of the Licensee or its licensors respectively.
All Intellectual Property Rights to the Modified Software, Applications and
Devices shall remain with the Licensee and no rights thereto shall be granted
by the Licensee to The Qt Company under this Agreement (except as set forth in
Section 2.3 below).
2.3 Modified Software
Licensee may create bug-fixes, error corrections, patches or modifications to
the Licensed Software ("Modified Software"). Such Modified Software may break
the source or binary compatibility with the Licensed Software (including
without limitation through changing the application programming interfaces
("API") or by adding, changing or deleting any variable, method, or class
signature in the Licensed Software and/or any inter-process protocols, services
or standards in the Licensed Software libraries). To the extent that Licensee's
Modified Software so breaks source or binary compatibility with the Licensed
Software, Licensee acknowledges that The Qt Company's ability to provide
Support may be prevented or limited and Licensee's ability to make use of
Updates may be restricted.
Licensee may, at its sole and absolute discretion, choose to submit Modified
Software to The Qt Company ("Submitted Modified Software") in connection with
Licensee's Support request, service request or otherwise. In the event Licensee
does so, then, Licensee hereby grants The Qt Company a sublicensable,
assignable, irrevocable, perpetual, worldwide, non-exclusive, royalty-free and
fully paid-up license, under all of Licensee's Intellectual Property Rights, to
reproduce, adapt, translate, modify, and prepare derivative works of, publicly
display, publicly perform, sublicense, make available and distribute such
Submitted Modified Software as The Qt Company sees fit at its free and absolute
discretion.
3. LICENSES GRANTED
3.1 Development with Licensed Software
Subject to the terms of this Agreement, The Qt Company grants to Licensee a
personal, worldwide, non-exclusive, non-transferable license, valid for the
License Term, to use, modify and copy the Licensed Software by Designated Users
on the Development Platforms for the sole purposes of designing, developing,
demonstrating and testing Application(s) and/or Devices, and to provide thereto
related support and other related services to end-user Customers.
Licensee may install copies of the Licensed Software on an unlimited number of
computers provided that (i) only the Designated Users may use the Licensed
Software, and (ii) all Designated Users must have a valid Development License
to use Licensed Software.
Licensee may at any time designate another Designated User to replace a then-
current Designated User by notifying The Qt Company in writing, provided that
any Designated User may be replaced only once during any six-month period.
Upon expiry of the initially agreed License Term, the respective License Terms
shall be automatically extended to one or more Renewal Term(s), unless and
until either Party notifies the other Party in writing that it does not wish to
continue the License Term, such notification to be provided to the other Party
no less than ninety (90) days before expiry of the respective License Term.
Unless otherwise agreed between the Parties, Renewal Term shall be of equal
length with the initial Term.
Any such Renewal Term shall be subject to License Fees agreed between the
Parties or, if no advance agreement exists, subject to The Qt Company's
standard pricing applicable at the commencement date of any such Renewal Term.
3.2 Distribution of Applications
Subject to the terms of this Agreement, The Qt Company grants to Licensee a
personal, worldwide, non-exclusive, non-transferable, revocable (for cause
pursuant to this Agreement) right and license, valid for the Term, to
(i) distribute, by itself or through its Contractors, Redistributables as
installed, incorporated or integrated into Applications for execution on the
Deployment Platforms, and
(ii) grant sublicenses to Redistributables, as distributed hereunder, for
Customers solely for Customer's internal use and to the extent necessary in
order for the Customers to use the Applications for their respective intended
purposes.
Right to distribute the Redistributables as part of an Application as provided
herein is not royalty-bearing but is conditional upon the Licensee having paid
the agreed Development Licenses from The Qt Company before distributing any
Redistributables to Customers.
3.3 Distribution of Devices
Subject to the terms of this Agreement, The Qt Company grants to Licensee a
personal, worldwide, non-exclusive, non-transferable, revocable (for cause
pursuant to this Agreement) right and license, valid for the Term, to
(i) distribute, by itself or through one or more tiers of Contractors,
Redistributables as installed, incorporated or integrated, or intended to be
installed, incorporated or integrated into Devices for execution on the
Deployment Platforms, and
(ii) grant sublicenses to Redistributables, as distributed hereunder, for
Customers solely for Customer's internal use and to the extent necessary in
order for the Customers to use the Devices for their respective intended
purposes.
Right to distribute the Redistributables with Devices as provided herein is
conditional upon the Licensee having purchased and paid the appropriate amount
of Development and Distribution Licenses from The Qt Company before
distributing any Redistributables to Customers.
3.4 Further Requirements
The licenses granted above in this Section 3 by The Qt Company to Licensee are
conditional and subject to Licensee's compliance with the following terms:
(i) Licensee shall not remove or alter any copyright, trademark or other
proprietary rights notice contained in any portion of the Licensed Software;
(ii) Applications must add primary and substantial functionality to the
Licensed Software;
(iii) Applications may not pass on functionality which in any way makes it
possible for others to create software with the Licensed Software; provided
however that Licensee may use the Licensed Software's scripting and QML ("Qt
Quick") functionality solely in order to enable scripting, themes and styles
that augment the functionality and appearance of the Application(s) without
adding primary and substantial functionality to the Application(s);
(iv) Applications must not compete with the Licensed Software;
(v) Licensee shall not use The Qt Company's or any of its suppliers' names,
logos, or trademarks to market Applications, except that Licensee may use
"Built with Qt" logo to indicate that Application(s) was developed using the
Licensed Software;
(vi) Licensee shall not distribute, sublicense or disclose source code of
Licensed Software to any third party (provided however that Licensee may
appoint employee(s) of Contractors as Designated Users to use Licensed
Software pursuant to this Agreement). Such right may be available for the
Licensee subject to a separate software development kit ("SDK") license
agreement to be concluded with The Qt Company;
(vii) Licensee shall not grant the Customers a right to (i) make copies of the
Redistributables except when and to the extent required to use the Applications
and/or Devices for their intended purpose, (ii) modify the Redistributables or
create derivative works thereof, (iii) decompile, disassemble or otherwise
reverse engineer Redistributables, or (iv) redistribute any copy or portion of
the Redistributables to any third party, except as part of the onward sale of
the Device on which the Redistributables are installed;
(viii) Licensee shall not and shall cause that its Affiliates or Contractors
shall not a) in any way combine, incorporate or integrate Licensed Software
with, or use Licensed Software for creation of, any software created with or
incorporating Open Source Qt, or b) incorporate or integrate Applications
into a hardware device or product other than a Device, unless Licensee has
received an advance written permission from The Qt Company to do so. Absent
such written permission, any and all distribution by the Licensee during the
Term of a hardware device or product a) which incorporate or integrate any
part of Licensed Software or Open Source Qt; or b) where the main user
interface or substantial functionality is provided by software build with
Licensed Software or Open Source Qt or otherwise depends on the Licensed
Software or Open Source Qt, shall be considered as a Device distribution under
this Agreement and dependent on compliance thereof (including but not limited
to obligation to pay applicable License Fees for such distribution);
(ix) Licensee shall cause all of its Affiliates and Contractors entitled to
make use of the licenses granted under this Agreement, to be contractually
bound to comply with the relevant terms of this Agreement and not to use the
Licensed Software beyond the terms hereof and for any purposes other than
operating within the scope of their services for Licensee. Licensee shall be
responsible for any and all actions and omissions of its Affiliates and
Contractors relating to the Licensed Software and use thereof (including but
not limited to payment of all applicable License Fees);
(x) Except when and to the extent explicitly provided in this Section 3,
Licensee shall not transfer, publish, disclose, display or otherwise make
available the Licensed Software;
; and
(xi) Licensee shall not attempt or enlist a third party to conduct or attempt
to conduct any of the above.
Above terms shall not be applicable if and to the extent they conflict with any
mandatory provisions of any applicable laws.
Any use of Licensed Software beyond the provisions of this Agreement is
strictly prohibited and requires an additional license from The Qt Company.
4. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions. Third
Party Software does not comprise part of the Licensed Software. In some cases,
access to Third Party Software may be included in the Licensed Software. Such
Third Party Software will be listed in the ".../src/3rdparty" source tree
delivered with the Licensed Software or documented in the Licensed Software, as
such may be amended from time to time. Licensee acknowledges that use or
distribution of Third Party Software is in all respects subject to applicable
license terms of applicable third party right holders.
5. PRE-RELEASE CODE
The Licensed Software may contain pre-release code and functionality marked or
otherwise stated as "Technology Preview", "Alpha", "Beta" or similar
designation. Such pre-release code may be present in order to provide
experimental support for new platforms or preliminary versions of one or more
new functionalities. The pre-release code may not be at the level of
performance and compatibility of a final, generally available, product
offering of the Licensed Software. The pre-release parts of the Licensed
Software may not operate correctly, may contain errors and may be substantially
modified by The Qt Company prior to the first commercial product release, if
any. The Qt Company is under no obligation to make pre-release code
commercially available, or provide any Support or Updates relating thereto. The
Qt Company assumes no liability whatsoever regarding any pre-release code, but
any use thereof is exclusively at Licensee's own risk and expense.
6. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Qt Company hereby represents and warrants that it has the power and
authority to grant the rights and licenses granted to Licensee under this
Agreement.
Except as set forth above, the Licensed Software is licensed to Licensee
"as is" and Licensee's exclusive remedy and The Qt Company's entire liability
for errors in the Licensed Software shall be limited, at The Qt Company's
option, to correction of the error, replacement of the Licensed Software or
return of the applicable fees paid for the defective Licensed Software for the
time period during which the License is not able to utilize the Licensed
Software under the terms of this Agreement.
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, THE QT COMPANY ON BEHALF OF
ITSELF AND ITS LICENSORS, SUPPLIERS AND AFFILIATES, DISCLAIMS ALL OTHER
WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, ANY IMPLIED
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-
INFRINGEMENT WITH REGARD TO THE LICENSED SOFTWARE. THE QT COMPANY DOES NOT
WARRANT THAT THE LICENSED SOFTWARE WILL SATISFY LICENSEE'S REQUIREMENTS OR THAT
IT WILL OPERATE WITHOUT DEFECT OR ERROR OR THAT THE OPERATION THEREOF WILL BE
UNINTERRUPTED. ALL USE OF AND RELIANCE ON THE LICENSED SOFTWARE IS AT THE SOLE
RISK OF AND RESPONSIBILITY OF LICENSEE.
7. INDEMNIFICATION AND LIMITATION OF LIABILITY
7.1 Limitation of Liability
EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II)
BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN NO
EVENT SHALL EITHER PARTY BE LIABLE TO THE OTHER PARTY FOR ANY LOSS OF PROFIT,
LOSS OF DATA, LOSS OF BUSINESS OR GOODWILL OR ANY OTHER INDIRECT, SPECIAL,
CONSEQUENTIAL, INCIDENTAL OR PUNITIVE COST, DAMAGES OR EXPENSE OF ANY KIND,
HOWSOEVER ARISING UNDER OR IN CONNECTION WITH THIS AGREEMENT. PARTIES
SPECIFICALLY AGREE THAT LICENSEE'S OBLIGATION TO PAY LICENSE AND OTHER FEES
CORRESPONDING TO ACTUAL USAGE OF LICENSED SOFTWARE HEREUNDER SHALL BE
CONSIDERED AS A DIRECT DAMAGE.
EXCEPT FOR (I) CASES OF GROSS NEGLIGENCE OR INTENTIONAL MISCONDUCT, AND (II)
BREACH OF CONFIDENTIALITY, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, IN
NO EVENT SHALL EITHER PARTY'S TOTAL AGGREGATE LIABILITY UNDER THIS AGREEMENT
EXCEED THE AGGREGATE LICENSE FEES PAID OR PAYABLE TO THE QT COMPANY FROM
LICENSEE DURING THE PERIOD OF TWELVE (12) MONTHS IMMEDIATELY PRECEDING THE
EVENT RESULTING IN SUCH LIABILITY.
THE PROVISIONS OF THIS SECTION 7 ALLOCATE THE RISKS UNDER THIS AGREEMENT
BETWEEN THE QT COMPANY AND LICENSEE AND THE PARTIES HAVE RELIED UPON THE
LIMITATIONS SET FORTH HEREIN IN DETERMINING WHETHER TO ENTER INTO THIS AGREEMENT.
7.2 Licensee's Indemnification
Licensee shall indemnify and hold harmless The Qt Company from and against any
claim, injury, judgment, settlement, loss or expense, including attorneys' fees
related to: (a) Licensee's misrepresentation in connection with The Qt Company
or the Licensed Software or breach of this Agreement, (b) the Application or
Device (except where such cause of liability is solely attributable to the
Licensed Software).
8. SUPPORT, UPDATES AND ONLINE SERVICES
Upon due payment of the agreed License Fees the Licensee will be eligible to
receive Support and Updates and to use the Online Services during the License
Term, provided, however, that in the event the License Term is longer than 36
months, Support is provided only for the first 12 months, unless the Parties
specifically otherwise agree.
Unless otherwise decided by The Company at its free and absolute discretion,
Upgrades will not be included in the Support but may be available subject to
additional fees.
From time to time The Qt Company may change the Support terms, provided that
during the respective ongoing License Term the level of Support provided by The
Qt Company may not be reduced without the consent of the Licensee.
Unless otherwise agreed, The Qt Company shall not be responsible for providing
any service or support to Customers.
9. CONFIDENTIALITY
Each Party acknowledges that during the Term of this Agreement each Party may
receive information about the other Party's business, business methods,
business plans, customers, business relations, technology, and other
information, including the terms of this Agreement, that is confidential and
of great value to the other Party, and the value of which would be
significantly reduced if disclosed to third parties ("Confidential
Information"). Accordingly, when a Party (the "Receiving Party") receives
Confidential Information from the other Party (the "Disclosing Party"), the
Receiving Party shall only disclose such information to employees and
Contractors on a need to know basis, and shall cause its employees and
employees of its Affiliates to: (i) maintain any and all Confidential
Information in confidence; (ii) not disclose the Confidential Information to a
third party without the Disclosing Party's prior written approval; and (iii)
not, directly or indirectly, use the Confidential Information for any purpose
other than for exercising its rights and fulfilling its responsibilities
pursuant to this Agreement. Each Party shall take reasonable measures to
protect the Confidential Information of the other Party, which measures shall
not be less than the measures taken by such Party to protect its own
confidential and proprietary information.
Obligation of confidentiality shall not apply to information that (i) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (ii) was in the Receiving Party's lawful possession prior to
the disclosure hereunder and was not subject to limitations on disclosure or
use; (iii) is developed independently by employees or Contractors of the
Receiving Party or other persons working for the Receiving Party who have not
had access to the Confidential Information of the Disclosing Party, as proven
by the written records of the Receiving Party; (iv) is lawfully disclosed to
the Receiving Party without restrictions, by a third party not under an
obligation of confidentiality; or (v) the Receiving Party is legally compelled
to disclose, in which case the Receiving Party shall notify the Disclosing
Party of such compelled disclosure and assert the privileged and confidential
nature of the information and cooperate fully with the Disclosing Party to
limit the scope of disclosure and the dissemination of disclosed Confidential
Information to the minimum extent necessary.
The obligations under this Section 9 shall continue to remain in force for a
period of five (5) years after the last disclosure, and, with respect to trade
secrets, for so long as such trade secrets are protected under applicable trade
secret laws.
10. FEES, DELIVERY AND PAYMENT
10.1 License Fees
License Fees are described in The Qt Company's standard price list, quote or
Purchase Order confirmation or in an appendix hereto, as the case may be.
The License Fees shall not be refunded or claimed as a credit in any event or
for any reason whatsoever.
10.2 Ordering Licenses
Licensee may purchase Development Licenses and Distribution Licenses pursuant
to agreed pricing terms or, if no specific pricing terms have been agreed upon,
at The Qt Company's standard pricing terms applicable at the time of purchase.
Licensee shall submit all purchase orders for Development Licenses and
Distribution Licenses to The Qt Company by email or any other method acceptable
to The Qt Company (each such order is referred to herein as a "Purchase Order")
for confirmation, whereupon the Purchase Order shall become binding between the
Parties.
10.3 Distribution License Packs
Unless otherwise agreed, Distribution Licenses shall be purchased by way of
Distribution License Packs.
Upon due payment of the ordered Distribution License Pack(s), the Licensee will
have an account of Distribution Licenses available for installing, bundling or
integrating (all jointly "installing") the Redistributables with the Devices or
for otherwise distributing the Redistributables in accordance with this
Agreement.
Each time Licensee "installs" or distributes a copy of Redistributables, then
one Distribution License is used, and Licensee's account of available
Distribution Licenses is decreased accordingly.
Licensee may "install" copies of the Redistributables so long as Licensee has
Distribution Licenses remaining on its account.
Redistributables will be deemed to have been "installed" into a Device when one
of the following circumstances shall have occurred: a) the Redistributables
have been loaded onto the Device and used outside of the Licensee's premises or
b) the Device has been fully tested and placed into Licensee's inventory
(or sold) for the first time (i.e., Licensee will not be required to use
(or pay for) more than one Distribution License for each individual Device,
e.g. in a situation where a Device is returned to Licensee's inventory after
delivery to a distributor or sale to a Customer). In addition, if Licensee
includes a back-up copy of the Redistributables on a CD-ROM or other storage
medium along with the product, that backup copy of the Redistributables will
not be deemed to have been "installed" and will not require an additional
Distribution License.
10.4 Payment Terms
License Fees and any other charges under this Agreement shall be paid by
Licensee no later than thirty (30) days from the date of the applicable invoice
from The Qt Company.
The Qt Company will submit an invoice to Licensee after the date of this
Agreement and/or after The Qt Company receives a Purchase Order from
Licensee.
A late payment charge of the lower of (a) one percent per month; or (b) the
interest rate stipulated by applicable law, shall be charged on any unpaid
balances that remain past due.
The Qt Company shall have the right to suspend, terminate or withhold grants
of all rights to the Licensed Software hereunder, including but not limited to
the Developer License, Distribution License, and Support, should Licensee fail
to make payment in timely fashion.
10.5 Taxes
All License Fees and other charges payable hereunder are gross amounts but
exclusive of any value added tax, use tax, sales tax and other taxes, duties or
tariffs ("Taxes"). Such applicable Taxes shall be paid by Licensee, or, where
applicable, in lieu of payment of such Taxes, Licensee shall provide an
exemption certificate to The Qt Company and any applicable authority.
11 RECORD-KEEPING AND REPORTING OBLIGATIONS; AUDIT RIGHTS
11.1 Licensee's Record-keeping
Licensee shall at all times maintain accurate and up-to-date written records of
Licensee's activities related to the use of Licensed Software and distribution
of Redistributables. The records shall be adequate to determine Licensee's
compliance with the provisions of this Agreement and to demonstrate the number
of Designated Users and Redistributables distributed by Licensee. The records
shall conform to good accounting practices reasonably acceptable to The Qt
Company.
Licensee shall, within thirty (30) days from receiving The Qt Company's request
to that effect, deliver to The Qt Company a report on Licensee's usage of
Licensed Software, such report to copies of Redistributables distributed by
Licensee during that calendar quarter, and also detailing the number of
undistributed copies of Redistributables made by Licensee and remaining in its
account contain information, in sufficient detail, on (i) amount of users
working with Licensed Software, (ii) copies of Redistributables distributed by
Licensee during that calendar quarter, (iii) number of undistributed copies of
Redistributables and corresponding number of unused Distribution Licenses
remaining on Licensee's account, and (iv) any other information as The Qt
Company may reasonably require from time to time.
11.2. The Qt Company's Audit Rights
The Qt Company or an independent auditor acting on behalf of The Qt Company's,
may, upon at least five (5) business days' prior written notice and at its
expense, audit Licensee with respect to the use of the Redistributables, but
not more frequently than once during each 6-month period. Such audit may be
conducted by mail, electronic means or through an in-person visit to Licensee's
place of business. Any such in-person audit shall be conducted during regular
business hours at Licensee's facilities and shall not unreasonably interfere
with Licensee's business activities. The Qt Company or the independent auditor
acting on behalf of The Qt Company shall be entitled to inspect Licensee's
Records. All such Licensee's Records and use thereof shall be subject to an
obligation of confidentiality under this Agreement.
If an audit reveals that Licensee is using the Licensed Software beyond scope
of the licenses Licensee has paid for, Licensee agrees to immediately pay The
Qt Company any amounts owed for such unauthorized use.
In addition, in the event the audit reveals a material violation of the terms
of this Agreement (underpayment of more than 5% of License Fees shall always be
deemed a material violation for purposes of this section), then the Licensee
shall pay The Qt Company's reasonable cost of conducting such audit.
12 TERM AND TERMINATION
12.1 Term
This Agreement shall enter into force upon due acceptance by both Parties and
remain in force for as long as there is any Development License(s) in force
("Term"), unless and until terminated pursuant to the terms of this Section 12.
12.2 Termination by The Qt Company
The Qt Company shall have the right to terminate this Agreement upon thirty
(30) days prior written notice if the Licensee is in material breach of any
obligation of this Agreement and fails to remedy such breach within such notice
period.
12.3 Mutual Right to Terminate
Either Party shall have the right to terminate this Agreement immediately upon
written notice in the event that the other Party becomes insolvent, files for
any form of bankruptcy, makes any assignment for the benefit of creditors, has
a receiver, administrative receiver or officer appointed over the whole or a
substantial part of its assets, ceases to conduct business, or an act
equivalent to any of the above occurs under the laws of the jurisdiction of the
other Party.
12.4 Parties' Rights and Duties upon Termination
Upon expiry or termination of the Agreement Licensee shall cease and shall
cause all Designated Users (including those of its Affiliates' and
Contractors') to cease using the Licensed Software and distribution of the
Redistributables under this Agreement.
Notwithstanding the above, in the event the Agreement expires or is terminated:
(i) as a result of The Qt Company choosing not to renew the Development
License(s) as set forth in Section 3.1, then all valid licenses possessed by
the Licensee at such date shall be extended to be valid in perpetuity under the
terms of this Agreement and Licensee is entitled to purchase additional
licenses as set forth in Section 10.2; or
(ii) for reason other than by The Qt Company pursuant to item (i) above or
pursuant to Section 12.2, then the Licensee is entitled, for a period of six
(6) months after the effective date of termination, to continue distribution of
Devices under the Distribution Licenses paid but unused at such effective date
of termination.
Upon any such termination the Licensee shall destroy or return to The Qt
Company all copies of the Licensed Software and all related materials and will
certify the same to The Qt Company upon its request, provided however that
Licensee may retain and exploit such copies of the Licensed Software as it may
reasonably require in providing continued support to Customers.
Expiry or termination of this Agreement for any reason whatsoever shall not
relieve Licensee of its obligation to pay any License Fees accrued or payable
to The Qt Company prior to the effective date of termination, and Licensee
shall immediately pay to The Qt Company all such fees upon the effective date
of termination. Termination of this Agreement shall not affect any rights of
Customers to continue use of Applications and Devices (and therein incorporated
Redistributables).
12.5 Extension in case of bankruptcy
In the event The Qt Company is declared bankrupt under a final, non-cancellable
decision by relevant court of law, and this Agreement is not, at the date of
expiry of the Development License(s) pursuant to Section 3.1, assigned to
party, who has assumed The Qt Company's position as a legitimate licensor of
Licensed Software under this Agreement, then all valid licenses possessed by
the Licensee at such date of expiry, and which the Licensee has not notified
for expiry, shall be extended to be valid in perpetuity under the terms of
this Agreement.
13. GOVERNING LAW AND LEGAL VENUE
In the event this Agreement is in the name of The Qt Company Inc., a Delaware
Corporation, then:
(i) this Agreement shall be construed and interpreted in accordance with the
laws of the State of California, USA, excluding its choice of law provisions;
(ii) the United Nations Convention on Contracts for the International Sale of
Goods will not apply to this Agreement; and
(iii) any dispute, claim or controversy arising out of or relating to this
Agreement or the breach, termination, enforcement, interpretation or validity
thereof, including the determination of the scope or applicability of this
Agreement to arbitrate, shall be determined by arbitration in San Francisco,
USA, before one arbitrator. The arbitration shall be administered by JAMS
pursuant to JAMS' Streamlined Arbitration Rules and Procedures. Judgment on the
Award may be entered in any court having jurisdiction. This Section shall not
preclude parties from seeking provisional remedies in aid of arbitration from a
court of appropriate jurisdiction.
In the event this Agreement is in the name of The Qt Company Ltd., a Finnish
Company, then:
(i) this Agreement shall be construed and interpreted in accordance with the
laws of Finland, excluding its choice of law provisions;
(ii) the United Nations Convention on Contracts for the International Sale of
Goods will not apply to this Agreement; and
(iii) any disputes, controversy or claim arising out of or relating to this
Agreement, or the breach, termination or validity thereof shall be shall be
finally settled by arbitration in accordance with the Arbitration Rules of
Finland Chamber of Commerce. The arbitration tribunal shall consist of one (1),
or if either Party so requires, of three (3), arbitrators. The award shall be
final and binding and enforceable in any court of competent jurisdiction. The
arbitration shall be held in Helsinki, Finland and the process shall be
conducted in the English language. This Section shall not preclude parties from
seeking provisional remedies in aid of arbitration from a court of appropriate
jurisdiction.
14. GENERAL PROVISIONS
14.1 No Assignment
Except in the case of a merger or sale of substantially all of its corporate
assets, Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior written
consent of The Qt Company, which shall not be unreasonably withheld or delayed.
The Qt Company shall be entitled to freely assign or transfer any of its
rights, benefits or obligations under this Agreement.
14.2 No Third Party Representations
Licensee shall make no representations or warranties concerning the Licensed
Software on behalf of The Qt Company. Any representation or warranty Licensee
makes or purports to make on The Qt Company's behalf shall be void as to The
Qt Company.
14.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably should
survive termination of this Agreement shall so be deemed to survive.
14.4 Entire Agreement
This Agreement, the exhibits hereto, the License Certificate and any applicable
Purchase Order constitute the complete agreement between the Parties and
supersedes all prior or contemporaneous discussions, representations, and
proposals, written or oral, with respect to the subject matters discussed
herein.
In the event of any conflict or inconsistency between this Agreement and any
Purchase Order, the terms of this Agreement will prevail over the terms of the
Purchase Order with respect to such conflict or inconsistency.
Parties specifically acknowledge and agree that this Agreement prevails over
any click-to-accept or similar agreements the Designated Users may need to
accept online upon download of the Licensed Software, as may be required by
The Qt Company's applicable processes relating to Licensed Software.
14.5 Modifications
No modification of this Agreement shall be effective unless contained in a
writing executed by an authorized representative of each Party. No term or
condition contained in Licensee's Purchase Order shall apply unless expressly
accepted by The Qt Company in writing.
14.6 Force Majeure
Except for the payment obligations hereunder, neither Party shall be liable to
the other for any delay or non-performance of its obligations hereunder in the
event and to the extent that such delay or non-performance is due to an event
of act of God, terrorist attack or other similar unforeseeable catastrophic
event that prevents either Party for fulfilling its obligations under this
Agreement and which such Party cannot avoid or circumvent ("Force Majeure
Event"). If the Force Majeure Event results in a delay or non-performance of a
Party for a period of three (3) months or longer, then either Party shall have
the right to terminate this Agreement with immediate effect without any
liability (except for the obligations of payment arising prior to the event of
Force Majeure) towards the other Party.
14.7 Notices
Any notice given by one Party to the other shall be deemed properly given and
deemed received if specifically acknowledged by the receiving Party in writing
or when successfully delivered to the recipient by hand, fax, or special
courier during normal business hours on a business day to the addresses
specified for each Party on the signature page. Each communication and document
made or delivered by one Party to the other Party pursuant to this Agreement
shall be in the English language.
14.8 Export Control
Licensee acknowledges that the Redistributables may be subject to export
control restrictions under the applicable laws of respective countries.
Licensee shall fully comply with all applicable export license restrictions
and requirements as well as with all laws and regulations relating to the
Redistributables and exercise of licenses hereunder and shall procure all
necessary governmental authorizations, including without limitation, all
necessary licenses, approvals, permissions or consents, where necessary for the
re-exportation of the Redistributables, Applications and/or Devices.
14.9 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder, shall
remain with The Qt Company and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with any
other software or hardware not delivered by The Qt Company under this Agreement.
14.10 Attorney Fees
The prevailing Party in any action to enforce this Agreement shall be entitled
to recover its attorney's fees and costs in connection with such action.
14.11 Severability
If any provision of this Agreement shall be adjudged by any court of competent
jurisdiction to be unenforceable or invalid, that provision shall be limited or
eliminated to the minimum extent necessary so that this Agreement shall
otherwise remain in full force and effect and enforceable.
IN WITNESS WHEREOF, the Parties hereto, intending to be legally bound hereby,
have caused this Agreement to be executed by Licensee's authorized
representative installing the Licensed Software and accepting the terms
hereof in connection therewith.
Appendix 1
1. Parts of the Licensed Software that are permitted for distribution in
object code form only ("Redistributables") under this Agreement:
- The Licensed Software's Qt Essentials and Qt Add-on libraries
- The Licensed Software's configuration tool ("qtconfig")
- The Licensed Software's help tool ("Qt Assistant")
- The Licensed Software's internationalization tools ("Qt Linguist", "lupdate",
"lrelease")
- The Licensed Software's QML ("Qt Quick") launcher tool ("qmlscene" or
"qmlviewer")
- The Licensed Software's installer framework
2. Parts of the Licensed Software that are not permitted for distribution
include, but are not limited to:
- The Licensed Software's source code and header files
- The Licensed Software's documentation
- The Licensed Software's documentation generation tool ("qdoc")
- The Licensed Software's tool for writing makefiles ("qmake")
- The Licensed Software's Meta Object Compiler ("moc")
- The Licensed Software's User Interface Compiler ("uic")
- The Licensed Software's Resource Compiler ("rcc")
- The Licensed Software's parts of the IDE tool ("Qt Creator")
- The Licensed Software's parts of the Design tools ("Qt 3D Studio" or
"Qt Quick Designer")
- The Licensed Software's Emulator

60
README
View File

@@ -10,53 +10,43 @@ HOW TO BUILD QT5
- Perl 5.8 or later
- Python 2.7 or later
- C++ compiler supporting the C++98 standard
- C++ compiler supporting the C++11 standard
For other platform specific requirements,
please see section "Setting up your machine" on:
http://qt-project.org/wiki/Get_The_Source
http://wiki.qt.io/Get_The_Source
Optional requirements
---------------------
Licensing:
----------
- OpenSSL for SSL sockets or HTTPS
- Wayland
Opensource users:
New dependencies in Qt 5
------------------------
<license> = -opensource
Linux: On systems running X11, the XCB libraries are required for
the platform plugin to build. qtbase/src/plugins/platforms/xcb/README
lists the required packages.
Commercial users:
Qt 5 can make use of the ICU libraries providing Unicode and Globalization
support (see http://site.icu-project.org/). They are required for building
QtWebKit.
On Linux, they will be auto-detected.
On Windows, they need to be manually installed and the "include" and "lib"
folders of the ICU installation must be appended to the INCLUDE and LIB
environment variables after calling the Windows SDK setup script.
The "bin" folder of the ICU installation should be appended to the PATH
environment variable in order to for the DLLs to be found at run-time.
<license> = -commercial
Linux, Mac:
-----------
cd <path>/qt-everywhere-opensource-src-<version>
./configure -prefix $PWD/qtbase -opensource -nomake tests
cd <path>/<source_package>
./configure -prefix $PWD/qtbase <license> -nomake tests
make -j 4
Windows:
--------
Open a Windows SDK (7.0, 7.1 or later) command prompt. Ensure that the
following tools can be found in the path:
Open a command prompt.
Ensure that the following tools can be found in the path:
* Supported compiler (Visual Studio 2012 or later,
MinGW-builds gcc 4.9 or later)
* Perl version 5.12 or later [http://www.activestate.com/activeperl/]
* Python version 2.7 or later [http://www.activestate.com/activepython/]
* Ruby version 1.9.3 or later [http://rubyinstaller.org/]
cd <path>\qt-everywhere-opensource-src-<version>
configure -prefix %CD%\qtbase -opensource -nomake tests
cd <path>\<source_package>
configure -prefix %CD%\qtbase <license> -nomake tests
nmake // jom // mingw32-make
To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
@@ -81,13 +71,13 @@ HOW TO BUILD QT5
Example for a release build:
(adjust the `-jN' parameter as appropriate for your system)
./configure -prefix $PWD/qtbase -opensource
./configure -prefix $PWD/qtbase <license>
make -j4
Example for a developer build:
(enables more autotests, builds debug version of libraries, ...)
./configure -developer-build -opensource
./configure -developer-build <license>
make -j4
See output of `./configure -help' for documentation on various options to
@@ -97,11 +87,11 @@ HOW TO BUILD QT5
default in the build system.
It is possible to build selected modules with their dependencies by doing
a `make module-<foo>'. For example, to build only qtscript and qtwebkit,
and the modules they depend on:
a `make module-<foo>'. For example, to build only qtdeclarative,
and the modules it depends on:
./configure -prefix $PWD/qtbase -opensource
make -j4 module-qtscript module-qtwebkit
./configure -prefix $PWD/qtbase <license>
make -j4 module-qtdeclarative
This can save a lot of time if you are only interested in a subset of Qt5.
@@ -119,9 +109,9 @@ HOW TO BUILD QT5
Building Qt5 from git
=====================
See http://qt-project.org/wiki/Building-Qt-5-from-Git and README.git
See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
for more information.
See http://qt-project.org/wiki/Qt-5 for the reference platforms.
See http://wiki.qt.io/Qt_5 for the reference platforms.
Documentation
@@ -139,6 +129,6 @@ HOW TO BUILD QT5
Running "qmake -query" will list the value of QT_INSTALL_DOCS.
Information about Qt 5's documentation is located in qtbase/doc/README
or in the following page: http://qt-project.org/wiki/Qt5DocumentationProject
or in the following page: http://wiki.qt.io/Qt5DocumentationProject
Note: Building the documentation is only tested on desktop platforms.

View File

@@ -5,7 +5,7 @@ OBTAINING QT5 FROM GIT
========
For a more in-depth description on how to build Qt5 from git,
please see: http://qt-project.org/wiki/Building-Qt-5-from-Git
please see: http://wiki.qt.io/Building_Qt_5_from_Git
Get The Submodules
@@ -52,4 +52,4 @@ OBTAINING QT5 FROM GIT
================================
For more information on how to develop and contribute to Qt, please see:
http://qt-project.org/wiki/Category:Developing_Qt
http://wiki.qt.io/Category:Developing_Qt

82
_clang-format Normal file
View File

@@ -0,0 +1,82 @@
# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
# This is the clang-format configuration style to be used by Qt,
# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
# https://wiki.qt.io/Coding_Conventions
---
# Webkit style was loosely based on the Qt style
BasedOnStyle: WebKit
Standard: Cpp11
# Column width is limited to 100 in accordance with Qt Coding Style.
# https://wiki.qt.io/Qt_Coding_Style
# Note that this may be changed at some point in the future.
ColumnLimit: 100
# How much weight do extra characters after the line length limit have.
# PenaltyExcessCharacter: 4
# Disable reflow of qdoc comments: indentation rules are different.
# Translation comments are also excluded.
CommentPragmas: "^!|^:"
# We want a space between the type and the star for pointer types.
PointerBindsToType: false
# We use template< without space.
SpaceAfterTemplateKeyword: false
# We want to break before the operators, but not before a '='.
BreakBeforeBinaryOperators: NonAssignment
# Braces are usually attached, but not after functions or class declarations.
BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterControlStatement: false
AfterEnum: false
AfterFunction: true
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
# When constructor initializers do not fit on one line, put them each on a new line.
ConstructorInitializerAllOnOneLineOrOnePerLine: true
# Indent initializers by 4 spaces
ConstructorInitializerIndentWidth: 4
# Indent width for line continuations.
ContinuationIndentWidth: 8
# No indentation for namespaces.
NamespaceIndentation: None
# Horizontally align arguments after an open bracket.
# The coding style does not specify the following, but this is what gives
# results closest to the existing code.
AlignAfterOpenBracket: true
AlwaysBreakTemplateDeclarations: true
# Ideally we should also allow less short function in a single line, but
# clang-format does not handle that.
AllowShortFunctionsOnASingleLine: Inline
# The coding style specifies some include order categories, but also tells to
# separate categories with an empty line. It does not specify the order within
# the categories. Since the SortInclude feature of clang-format does not
# re-order includes separated by empty lines, the feature is not used.
SortIncludes: false
# macros for which the opening brace stays attached.
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
# Break constructor initializers before the colon and after the commas.
BreakConstructorInitializers: BeforeColon

16
coin/README Normal file
View File

@@ -0,0 +1,16 @@
Continuous Integration
======================
This directory contains files used by Qt's Continuous Integration system (Coin).
pre-provisioning
----------------
Contains scripts which are used to install software to tier1 machines manually.
E.g. Visual studio installation takes too long to be included to automatic provisioning of tier2 templates.
provisioning
------------
Contains scripts that apply to different test machines in order to run automatic tests on them.
For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set.
(Run as admin in PowerShell)

View File

@@ -0,0 +1,28 @@
Template Target OS Target arch Compiler Target Compiler Features
----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples
qtci-linux-Ubuntu-18.04-x86_64 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-18.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC Packaging DeveloperBuild NoPch DisableTests
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release
qtci-macos-10.12-x86_64-9 Clang DeveloperBuild NoFramework Release QtNamespace NoPch
qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release
qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck
qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1,22 @@
Template Target OS Target arch Compiler Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1,21 @@
Template Target OS Target arch Compiler Target Compiler Features
--------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2
qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1,7 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests
qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo
qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests

View File

@@ -0,0 +1,3 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo

View File

@@ -0,0 +1,4 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild
qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild

View File

@@ -0,0 +1,3 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples

View File

@@ -0,0 +1,4 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo

View File

@@ -0,0 +1,4 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests

View File

@@ -0,0 +1,6 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-7-x86_64-4 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-8.1-x86_64 MSVC2013 Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86-3 MSVC2017 Release ForceDebugInfo OpenGLDynamic

View File

@@ -0,0 +1,48 @@
############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
# This script will install Visual Studio 2017 Build Tools
# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
$version = "2017_version_15.0"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
$msvcPackage = "C:\Windows\Temp\$version.exe"
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
cmd /c "$msvcPackage --all --passive --wait"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio Build Tools = $version" >> ~\versions.txt

View File

@@ -0,0 +1,58 @@
#############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
# Install Visual Studio $version with $update_version
# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
$version = "2015"
$update_version = "3"
# Only way to install specific Visual studio release is to use feed.xml.
# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx'
# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates)
$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml"
$msvc_web_installer = "vs" + $version + "_" + $update_version
$package = "C:\Windows\temp\$msvc_web_installer.exe"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
echo "Fetching Visual Studio $version update $update_version..."
Download $url_official $url_cache $package
Verify-Checksum $package $sha1
echo "Installing Visual studio $version update $update_version..."
cmd /c "$package $parameters /norestart /Quiet"
remove-item $package
echo "Visual Studio = $version update $update_version" >> ~\versions.txt

View File

@@ -0,0 +1,49 @@
############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
# This script will install Visual Studio 2017
$version = "2017"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
$msvcPackage = "C:\Windows\Temp\$version.exe"
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio = $version" >> ~\versions.txt

View File

@@ -0,0 +1,48 @@
############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
# This script will install Visual Studio 2017 Build Tools
# https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017
$version = "2017_version_15.0"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_build_tools_for_visual_studio_" + $version + "_x86_x64_10254482.exe"
$sha1 = "a31e099e5114fef80a21654689e6864afc544a16"
$msvcPackage = "C:\Windows\Temp\$version.exe"
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
cmd /c "$msvcPackage --all --passive --wait"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio Build Tools = $version" >> ~\versions.txt

View File

@@ -0,0 +1,58 @@
#############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
# Install Visual Studio $version with $update_version
# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
$version = "2015"
$update_version = "3"
# Only way to install specific Visual studio release is to use feed.xml.
# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx'
# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates)
$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml"
$msvc_web_installer = "vs" + $version + "_" + $update_version
$package = "C:\Windows\temp\$msvc_web_installer.exe"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/$msvc_web_installer.exe"
$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
echo "Fetching Visual Studio $version update $update_version..."
Download $url_official $url_cache $package
Verify-Checksum $package $sha1
echo "Installing Visual studio $version update $update_version..."
cmd /c "$package $parameters /norestart /Quiet"
remove-item $package
echo "Visual Studio = $version update $update_version" >> ~\versions.txt

View File

@@ -0,0 +1,49 @@
############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\..\common\helpers.ps1"
# This script will install Visual Studio 2017
$version = "2017"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/mu_visual_studio_professional_" + $version + "_x86_x64_10049787.exe"
$sha1 = "8d678d27735018a99dc22ddb5412e4e6868991ae"
$msvcPackage = "C:\Windows\Temp\$version.exe"
Download $url_cache $url_cache $msvcPackage
Verify-Checksum $msvcPackage $sha1
cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM"
echo "Cleaning $msvcPackage.."
Remove-Item -Recurse -Force "$msvcPackage"
echo "Visual Studio = $version" >> ~\versions.txt

View File

@@ -0,0 +1,116 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# This script install Android sdk and ndk.
# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/android"
sdkTargetFolder="$targetFolder/sdk"
basePath="http://ci-files01-hki.intra.qt.io/input/android"
toolsVersion="r26.1.1"
toolsFile="sdk-tools-linux-4333796.zip"
ndkVersion="r18b"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
sdkBuildToolsVersion="28.0.3"
sdkApiLevel="android-28"
toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
ndkTargetFile="/tmp/$ndkFile"
ndkSourceFile="$basePath/$ndkFile"
DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
echo "Unzipping Android NDK to '$targetFolder'"
sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
echo "Unzipping Android Tools to '$sdkTargetFolder'"
sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
rm "$ndkTargetFile"
rm "$toolsTargetFile"
echo "Changing ownership of Android files."
if uname -a |grep -q "el7"; then
sudo chown -R qt:wheel "$targetFolder"
else
sudo chown -R qt:users "$targetFolder"
fi
echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
# shellcheck disable=SC2031
if [ "$http_proxy" != "" ]; then
proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
proxy_port=$(echo "$proxy" | cut -d':' -f3)
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
else
echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"
fi
echo "Checking the contents of Android SDK..."
ls -l "$sdkTargetFolder"
SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
# shellcheck disable=SC2129
echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
echo "Android NDK = $ndkVersion" >> ~/versions.txt
cd "$sdkTargetFolder/tools/bin"
./sdkmanager --install "emulator"
echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"
echo "Checking the contents of Android SDK again..."
ls -l "$sdkTargetFolder"
echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f
# Purely informative, show the list of avd devices
./avdmanager list avd

View File

@@ -0,0 +1,44 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
set -ex
function waitLoop {
while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
echo "Waiting for other software managers to finish..."
sleep 0.5
done
}

View File

@@ -0,0 +1,57 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2016 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 CMake 3.6.2
# CMake is needed for autotests that verify that Qt can be built with CMake
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="3.6.2"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz"
SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c"
targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-Linux-x86_64"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
SetEnvVar "PATH" "$targetFolder/bin:\$PATH"
echo "CMake = $version" >> ~/versions.txt

View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
sudo chmod -x /etc/cron.daily/cracklib-runtime

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo chmod -x /etc/cron.daily/mlocate*

View File

@@ -0,0 +1,4 @@
#!/usr/bin/env bash
sudo gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false
sudo gsettings set org.gnome.desktop.notifications show-banners false

View File

@@ -0,0 +1,44 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
set -ex
echo "Disable Network Time Protocol (NTP)"
if uname -a |grep -q "Ubuntu"; then
sudo timedatectl set-ntp false
else
(systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off
fi

View File

@@ -0,0 +1,7 @@
#!/usr/bin/env bash
# We need to disable selinux while we are overwriting some binaries
# required by it. If this is not done, ICU provisioning will create
# template that is not booting.
sudo sed -i s/SELINUX=enforcing/SELINUX=disabled/g /etc/selinux/config

View File

@@ -0,0 +1,52 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
set -ex
# Download and install the docker engine.
sudo apt-get install curl -y
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
sudo apt-get update
sudo apt-get install docker-ce -y
sudo usermod -a -G docker $USER
sudo docker info
# Download and install the docker-compose extension.
sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
sudo chmod +x /usr/local/bin/docker-compose
# Start testserver provisioning
source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh"

View File

@@ -0,0 +1,78 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
version="1.38.16"
version_node="8.9.1"
urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-llvm-e$version.tar.gz"
urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d"
sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673"
sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
targetFolder="/opt/emsdk"
sudo mkdir "$targetFolder"
InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" ""
InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" ""
InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" ""
sudo chmod -R a+rwx "$targetFolder"
echo "Writing $targetFolder/.emscripten"
cat <<EOM >"$targetFolder/.emscripten"
LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/'
EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer'
BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen'
NODE_JS='$targetFolder/node-v$version_node-linux-x64/bin/node'
EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
SPIDERMONKEY_ENGINE = ''
V8_ENGINE = ''
TEMP_DIR = '/tmp'
COMPILER_ENGINE = NODE_JS
JS_ENGINES = [NODE_JS]
EOM
SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\""
SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"

View File

@@ -0,0 +1,65 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# This script installs FBX SDK
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
set -e
tarballName="fbx20161_2_fbxsdk_linux.tar.gz"
targetFolder="/opt/fbx"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/fbx/$tarballName"
officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$tarballName"
sha1="b0a08778de025e2c6e90d6fbdb6531f74a3da605"
tmpFolder="/tmp"
targetFile="$tmpFolder/$tarballName"
installer="$tmpFolder/fbx20161_2_fbxsdk_linux"
DownloadURL "$cachedUrl" "$officialUrl" "$sha1" "$targetFile"
sudo tar -C $tmpFolder -xf "$targetFile"
sudo mkdir -p $targetFolder
(echo "yes"; echo "n") | sudo "$installer" -w "$tmpFolder" "$targetFolder"
rm -rf "$targetFile"
# Set env variables
SetEnvVar "FBXSDK" "$targetFolder"
echo "FBX SDK = 2016.1.2" >> ~/versions.txt

View File

@@ -0,0 +1,102 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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 builds GCC from sources
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
set -ex
function InstallGCC() {
version=$1
priority=$2
prebuiltSHA1=$3
sourcesSHA1=$4
tmpFolder="/tmp"
prebuiltGCC="http://ci-files01-hki.intra.qt.io/input/gcc/gcc-$version-prebuilt.tar.gz"
prebuiltTarget="$tmpFolder/gcc-$version-prebuilt.tar.gz"
installPrefix="/usr/local"
suffixVersion=$(echo "$version" | cut -d "." -f1,2)
sourceFile="gcc-$version.tar.xz"
cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile"
officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile"
targetFile="$tmpFolder/$sourceFile"
buildFolder="$HOME/gcc_build"
echo "Fetching prebuilt GCC."
curl --fail -L --retry 5 --retry-delay 5 -o "$prebuiltTarget" "$prebuiltGCC" || (
echo "Fetching prebuilt GCC failed. Building from sources."
DownloadURL "$cachedUrl" "$officialUrl" "$sourcesSHA1" "$targetFile"
)
if [ -f "$prebuiltTarget" ]; then
echo "$prebuiltSHA1 *$prebuiltTarget" | sha1sum -c -
sudo tar -xzf "$prebuiltTarget" -C "$installPrefix"
rm -rf "$prebuiltTarget"
else
tar -C "$tmpFolder" -xJf "$targetFile"
mkdir -p "$buildFolder"
cd "$tmpFolder/gcc-$version"
sudo "$tmpFolder/gcc-$version/contrib/download_prerequisites"
cd "$buildFolder"
"$tmpFolder/gcc-$version/configure" --disable-bootstrap --enable-languages=c,c++,lto --prefix="$installPrefix" --program-suffix="-$suffixVersion"
make -j4
sudo make install
rm -rf "$targetFile"
rm -rf "$tmpFolder/gcc-$version"
fi
# openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links
if [ -f "/usr/sbin/update-alternatives" ]; then
sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \
--slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \
--slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \
--slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion"
else
sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority"
sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority"
fi
echo "GCC = $version" >> ~/versions.txt
}

View File

@@ -0,0 +1,58 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# This script installs INTEGRITY
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="11.4.4"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
AltUrl="$PrimaryUrl" # we lack an external source for this
SHA1="4afa3c15e13c91734951b73f6b21388294c5d794"
targetFolder="/opt/ghs"
appPrefix=""
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
SetEnvVar "INTEGRITY_BSP" "platform-cortex-a9"
SetEnvVar "INTEGRITY_PATH" "$targetFolder/comp_201654"
SetEnvVar "INTEGRITY_DIR" "$targetFolder/int1144"
SetEnvVar "INTEGRITY_GL_INC_DIR" "\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc"
SetEnvVar "INTEGRITY_GL_LIB_DIR" "\$INTEGRITY_DIR/libs/Vivante"
echo "INTEGRITY = $version" >> ~/versions.txt

View File

@@ -0,0 +1,67 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# 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.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="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
opensslHome="${installFolder}openssl-1.0.2"
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}p" "${opensslHome}"
pushd "$opensslHome"
echo "Running configure"
perl Configure shared android
SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
echo "OpenSSL for Android = $version" >> ~/versions.txt

View File

@@ -0,0 +1,66 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# This script installs QNX 6.6.0.
set -ex
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
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"
echo "$sha1 $targetFile" | sha1sum --check
if [ ! -d "$targetFolder" ]; then
mkdir -p $targetFolder
fi
sudo tar -C $targetFolder -xvzf $targetFile
sudo chown -R qt:users "$targetFolder"/"$folderName"
# Verify that we have last file in tar
if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then
echo "Installation failed!"
exit -1
fi
rm -rf $targetFile
# Set env variables
SetEnvVar "QNX_660" "$targetFolder$folderName"
echo "QNX SDP = 6.6.0" >> ~/versions.txt

View File

@@ -0,0 +1,67 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# This script installs QNX 7.
set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
targetFolder="/opt/"
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 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
echo "$sha1 $targetFile" | sha1sum --check
if [ ! -d "$targetFolder" ]; then
mkdir -p $targetFolder
fi
sudo tar -C $targetFolder -Jxf $targetFile
sudo chown -R qt:users "$targetFolder"/"$folderName"
# Verify that we have last file in tar
if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
echo "Installation failed!"
exit -1
fi
rm -rf $targetFile
# Set env variables
SetEnvVar "QNX_700" "$targetFolder$folderName"
echo "QNX SDP = 7.0.0" >> ~/versions.txt

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo apt-get purge apport -y

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo apt -q -y remove update-notifier update-manager

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo apt-get remove update-manager

View File

@@ -0,0 +1,60 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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 Squish Coco
set -ex
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="4.2.2"
sha1="a44f0f039f3712c715eea63c4021d08bf17a44c6"
package="SquishCocoSetup_${version}_Linux_x86_64.run"
url="http://ci-files01-hki.intra.qt.io/input/coco//$package"
echo "Enable license for Coco"
DownloadURL "$url" "$url" "$sha1" "/tmp/$package"
sudo chmod 755 "/tmp/$package"
echo 1 | sudo "/tmp/$package" "--nox11"
/opt/SquishCoco/bin/cocolic --license-server=Qt-SRV-33.intra.qt.io:49344
echo "export PATH=/opt/SquishCoco/bin/:$PATH" >> ~/.bashrc

View File

@@ -0,0 +1,7 @@
FROM ubuntu:16.04
ARG packages="apache2 libcgi-session-perl wget avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 80 443
# install configurations and test data
RUN wget https://tools.ietf.org/rfc/rfc3252.txt

View File

@@ -0,0 +1,10 @@
FROM ubuntu:16.04
ARG packages="gdebi-core wget avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
RUN wget http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb
RUN gdebi -n dante-server_1.4.1-1_amd64.deb
EXPOSE 1080-1081
# install configurations and test data
COPY danted /etc/init.d/
COPY danted-authenticating /etc/init.d/

View File

@@ -0,0 +1,93 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: danted
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: SOCKS (v4 and v5) proxy daemon (danted)
### END INIT INFO
#
# dante SOCKS server init.d file. Based on /etc/init.d/skeleton:
# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/danted
NAME=danted
DESC="Dante SOCKS daemon"
PIDFILE=/var/run/$NAME.pid
CONFFILE=/etc/$NAME.conf
test -f $DAEMON || exit 0
set -e
# This function makes sure that the Dante server can write to the pid-file.
touch_pidfile ()
{
if [ -r $CONFFILE ]; then
uid="`sed -n -e 's/[[:space:]]//g' -e 's/#.*//' -e '/^user\.privileged/{s/[^:]*://p;q;}' \
$CONFFILE`"
if [ -n "$uid" ]; then
touch $PIDFILE
chown $uid $PIDFILE
fi
fi
}
. /lib/lsb/init-functions
case "$1" in
start)
if ! egrep -cve '^ *(#|$)' \
-e '^(logoutput|user\.((not)?privileged|libwrap)):' $CONFFILE > /dev/null
then
echo "Not starting $DESC: not configured."
exit 0
fi
echo -n "Starting $DESC: "
touch_pidfile
start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON -- -D
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
echo "$NAME."
;;
reload|force-reload)
#
# If the daemon can reload its config files on the fly
# for example by sending it SIGHUP, do it here.
#
# If the daemon responds to changes in its config file
# directly anyway, make this a do-nothing entry.
#
echo "Reloading $DESC configuration files."
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --exec $DAEMON -- -D
;;
restart)
#
# If the "reload" option is implemented, move the "force-reload"
# option to the "reload" entry above. If not, "force-reload" is
# just the same as "restart".
#
echo -n "Restarting $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
sleep 1
touch_pidfile
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- -D
echo "$NAME."
;;
status)
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
;;
*)
N=/etc/init.d/$NAME
# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
exit 0

View File

@@ -0,0 +1,97 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: danted-authenticating
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: SOCKS (v4 and v5) proxy daemon (danted)
### END INIT INFO
#
# dante SOCKS server init.d file. Based on /etc/init.d/skeleton:
# Version: @(#)skeleton 1.8 03-Mar-1998 miquels@cistron.nl
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/sbin/danted
NAME=danted-authenticating
DESC="Dante SOCKS daemon"
PIDFILE=/var/run/$NAME.pid
CONFFILE=/etc/$NAME.conf
DANTED_ARGS="-D -f $CONFFILE"
test -f $DAEMON || exit 0
set -e
# This function makes sure that the Dante server can write to the pid-file.
touch_pidfile ()
{
if [ -r $CONFFILE ]; then
uid="`sed -n -e 's/[[:space:]]//g' -e 's/#.*//' -e '/^user\.privileged/{s/[^:]*://p;q;}' \
$CONFFILE`"
if [ -n "$uid" ]; then
touch $PIDFILE
chown $uid $PIDFILE
fi
fi
}
. /lib/lsb/init-functions
case "$1" in
start)
if ! egrep -cve '^ *(#|$)' \
-e '^(logoutput|user\.((not)?privileged|libwrap)):' $CONFFILE > /dev/null
then
echo "Not starting $DESC: not configured."
exit 0
fi
echo -n "Starting $DESC: "
touch_pidfile
start-stop-daemon --start --quiet --oknodo --pidfile $PIDFILE \
--exec $DAEMON -- $DANTED_ARGS
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE --exec $DAEMON
echo "$NAME."
;;
reload|force-reload)
#
# If the daemon can reload its config files on the fly
# for example by sending it SIGHUP, do it here.
#
# If the daemon responds to changes in its config file
# directly anyway, make this a do-nothing entry.
#
echo "Reloading $DESC configuration files."
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE \
--exec $DAEMON -- $DANTED_ARGS
;;
restart)
#
# If the "reload" option is implemented, move the "force-reload"
# option to the "reload" entry above. If not, "force-reload" is
# just the same as "restart".
#
echo -n "Restarting $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE --exec $DAEMON
sleep 1
touch_pidfile
start-stop-daemon --start --quiet --pidfile $PIDFILE \
--exec $DAEMON -- $DANTED_ARGS
echo "$NAME."
;;
status)
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
;;
*)
N=/etc/init.d/$NAME
# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
echo "Usage: $N {start|stop|restart|force-reload}" >&2
exit 1
;;
esac
exit 0

View File

@@ -0,0 +1,69 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
set -ex
# Using SHA-1 of each server context as the tag of docker images. A tag labels a
# specific image version. It is used by docker compose file (docker-compose.yml)
# to launch the corresponding docker containers. If one of the server contexts
# (./apache2, ./danted, ...) gets changes, all the related compose files in
# qtbase should be updated as well.
#
# For example, here's how to get the SHA-1 of apache test server.
# find ./apache2 -type f -print0 | sort -z | xargs -r0 sha1sum | \
# awk '{ print $1 }' | sha1sum | awk '{ print $1 }'
testserver='apache2 squid vsftpd ftp-proxy danted'
for server in $testserver
do
context="${BASH_SOURCE%/*}/$server"
sha1=$(find $context -type f -print0 | sort -z | xargs -r0 sha1sum | awk '{ print $1 }' | \
sha1sum | awk '{ print $1 }')
sudo docker build -t qt-test-server-$server:$sha1 $context
# transition - The fixed tag is temporarily used by CI to pass the qtbase testing.
case $server in
apache2) fixed_tag="cc9ea678b92bdda33acb9fa0159bb4ad0f3cd947" ;;
squid) fixed_tag="577d99307eea9a8cccfec944d25be2bce2fe99cc" ;;
vsftpd) fixed_tag="18896604c7e90b543e56d80c8a8aabdb65a590d0" ;;
ftp-proxy) fixed_tag="2c6c8f1ab6a364b540c43d705fb6f15a585cb2af" ;;
danted) fixed_tag="327dd56c3c35db85b26fac93213a5a1918475bc7" ;;
esac
[ -z "$fixed_tag" ] || \
sudo docker tag qt-test-server-$server:$sha1 qt-test-server-$server:$fixed_tag
done
sudo docker images

View File

@@ -0,0 +1,4 @@
FROM ubuntu:16.04
ARG packages="ftp-proxy avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 2121

View File

@@ -0,0 +1,4 @@
FROM ubuntu:16.04
ARG packages="squid avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 3128-3130

View File

@@ -0,0 +1,7 @@
FROM ubuntu:16.04
ARG packages="vsftpd ftp wget avahi-daemon"
RUN apt-get update && apt-get install -y $packages && dpkg -l $packages
EXPOSE 20-21
# install configurations and test data
RUN wget https://tools.ietf.org/rfc/rfc3252.txt

View File

@@ -0,0 +1,46 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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 needs to be called last during provisioning so that the software information will show up last in provision log.
set -ex
# shellcheck disable=SC2129
echo "*********************************************" >> ~/versions.txt
echo "***** All installed packages *****" >> ~/versions.txt
apt list --installed >> ~/versions.txt
echo "*********************************************" >> ~/versions.txt
"$(dirname "$0")/version.sh"

View File

@@ -0,0 +1,43 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2016 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 will print all installed software to provision log.
# Script needs to be named so that it will be ran at last during provisioning
# Print all build machines versions to provision log
echo "*********************************************"
echo "***** SW VERSIONS *****"
cat ~/versions.txt
echo "*********************************************"

View File

@@ -0,0 +1,91 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# This script receives URLs to a compressed file. It then downloads it,
# uncompresses it and installs it by default
# to /Applications/. This can be overridden by a target parameter.
set -ex
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
function InstallAppFromCompressedFileFromURL {
url=$1
url_alt=$2
expectedSha1=$3
appPrefix=$4
target=$5
if [ "" == "$target" ]; then
target="/Applications/"
fi
basefilename=${url##*/}
extension=${basefilename##*.}
filename=${basefilename%.*}
if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
extension="tar.gz"
fi
echo "Extension for file: $extension"
echo "Creating temporary file and directory"
targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension")
# macOS 10.10 mktemp does require prefix
if [[ $OSTYPE == "darwin14" ]]; then
targetDirectory=$(mktemp -d -t '10.10')
else
targetDirectory=$(mktemp -d)
fi
(DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile")
echo "Uncompress $targetFile"
case $extension in
"tar.gz")
tar -xzf "$targetFile" --directory "$targetDirectory"
;;
"zip")
unzip -q "$targetFile" -d "$targetDirectory"
;;
*)
exit 1
;;
esac
echo "Moving app to '$target'"
sudo mv "$targetDirectory/$appPrefix/"* "$target"
echo "Removing file '$targetFile'"
rm "$targetFile"
echo "Removing directory '$targetDirectory'"
rm -rf "$targetDirectory"
}

View File

@@ -0,0 +1,59 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
set -ex
function InstallPKGFromURL {
url=$1
url_alt=$2
expectedSha1=$3
targetDirectory=$4
echo "Creating temporary file"
targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg")
echo "Downloading PKG from primary URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || (
echo "Failed to download '$url' multiple times"
echo "Downloading PKG from alternative URL '$url_alt'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
)
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
/usr/bin/shasum --check "$targetFile.sha1"
echo "Run installer on PKG"
sudo installer -package "$targetFile" -target "$targetDirectory"
echo "Removing file '$targetFile'"
rm "$targetFile"
}

View File

@@ -0,0 +1,54 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# This script installs CMake
# CMake is needed for autotests that verify that Qt can be built with CMake
# shellcheck source=./InstallAppFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.11.3-Darwin-x86_64.tar.gz"
AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz"
SHA1="3d13de8020ce560159fa5cecb669498c48552d96"
appPrefix="cmake-3.11.3-Darwin-x86_64"
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH"
echo "CMake = 3.11.3" >> ~/versions.txt

View File

@@ -0,0 +1,38 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# Disable spotlight and and stop indexing
sudo mdutil -a -i off
sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes"

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE

View File

@@ -0,0 +1,59 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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 FBX SDK
set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="2016.1.2"
fileName="fbx20161_2_fbxsdk_clang_mac.pkg_nospace.tgz"
cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName"
# officialUrl="http://download.autodesk.com/us/fbx_release_older/$version/fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
targetFolder="/tmp"
echo "Extracting '$cachedUrl'"
tar -xzf "$cachedUrl" -C "$targetFolder"
rm -rf "$targetFolder/$fileName"
echo "Copying preinstalled FBX SDK to Applications"
sudo cp -r "$targetFolder/Autodesk" /Applications
# Set env variables
SetEnvVar "FBXSDK" "/Applications/Autodesk/FBXSDK/2016.1.2/"
echo "FBX SDK = 2016.1.2" >> ~/versions.txt

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
# Will install homebrew package manager for macOS
/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null

View File

@@ -0,0 +1,63 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
set -ex
# Command line tools is need by homebrew
function InstallCommandLineTools {
url=$1
url_alt=$2
expectedSha1=$3
packageName=$4
version=$5
DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
echo "Mounting $packageName"
hdiutil attach "/tmp/$packageName"
cd "/Volumes/Command Line Developer Tools"
echo "Installing"
sudo installer -verbose -pkg ./*.pkg -target /
cd /
# Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
sleep 3
echo "Unmounting"
umount /Volumes/Command\ Line\ Developer\ Tools/
echo "Removing $packageName"
rm "/tmp/$packageName"
echo "Command Line Tools = $version" >> ~/versions.txt
}

View File

@@ -0,0 +1,81 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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 install OpenSSL
set -ex
# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../common/unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
opensslVersion="1.0.2p"
opensslFile="openssl-$opensslVersion.tar.gz"
opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
opensslSha1="f34b5322e92415755c7d58bf5d0d5cf37666382c"
# Below target location has been hard coded into Coin.
# QTQAINFRA-1195
openssl_install_dir=/usr/local/openssl-$opensslVersion
opensslTargetLocation="/usr/local/opt/openssl"
InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
cd "/tmp/openssl-$opensslVersion"
pwd
sudo ./config --prefix=$openssl_install_dir
echo "Running 'make' for OpenSSL"
sudo make --silent > /tmp/openssl_make.log 2>&1
echo "Running 'make install' for OpenSSL"
sudo make --silent install > /tmp/openssl_make_install.log 2>&1
path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
sudo mkdir -p "$path"
sudo ln -s $openssl_install_dir $opensslTargetLocation
SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\""
SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\""
SetEnvVar "OPENSSL_DIR" "\"$openssl_install_dir\""
SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem > /dev/null
sudo rm -rf /tmp/openssl-$opensslVersion
echo "OpenSSL = $opensslVersion" >> ~/versions.txt

View File

@@ -0,0 +1,77 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# 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

@@ -0,0 +1,63 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# This script installs JDK
set -ex
echo "Installing Java Development Kit"
targetFile=jdk-8u102-macosx-x64.dmg
url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
# url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
echo "Mounting $targetFile"
sudo mount "$url" /Volumes
sudo cp "/Volumes/$targetFile" /tmp
sudo umount /Volumes
sudo hdiutil attach "/tmp/$targetFile"
echo Installing JDK
cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /
echo "Unmounting $targetFile"
sudo hdiutil unmount /Volumes/JDK\ 8\ Update\ 102/ -force
echo "Disable auto update"
sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
echo "JDK Version = 8 update 102" >> ~/versions.txt

View File

@@ -0,0 +1,54 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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 libiodbc
set -ex
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
brew update
brew install libiodbc
# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc
read -r -a arr <<< $(brew list --versions libiodbc)
version=${arr[1]}
SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
echo "libiodbc = $version" >> ~/versions.txt

View File

@@ -0,0 +1,11 @@
#!/usr/bin/env bash
function InstallPip {
python=$1
# Will install pip utility for python
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
sudo "$python" get-pip.py
rm get-pip.py
}

View File

@@ -0,0 +1,59 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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 python2
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/pip.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg"
AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg"
SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09"
DestDir="/"
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
InstallPip python2.7
/Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv
SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
echo "python2 = 2.7.14" >> ~/versions.txt

View File

@@ -0,0 +1,65 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2017 The Qt Company Ltd.
## Copyright (C) 2017 Pelagicore AG
## 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 python3
# shellcheck source=./InstallPKGFromURL.sh
source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# shellcheck source=./pip.sh
source "${BASH_SOURCE%/*}/pip.sh"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg"
AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9"
DestDir="/"
InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
InstallPip python3.6
/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel
SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
# Install all needed packages in a special wheel cache directory
/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
echo "python3 = 3.6.1" >> ~/versions.txt

View File

@@ -0,0 +1,50 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'.
# In order to make all unix provioning scripts run on macOS without special case handling
# a symbolic link is created.
# The shasum tool is a perl script which does some globbing to determine the perl version. The
# symbolic link has to point directly to the binary including the perl version.
# Additionally the CI seems to have multiple parallel perl versions installed which causes
# multiple shasum tools to be present (shasum5.16, shasum5.18).
#
# Currently this is
# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
# shellcheck disable=SC2012
SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum

View File

@@ -0,0 +1,40 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# Disable "Download newly available updates in the background" from App Store
sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE
# Disable "Install system data files and security updates" from App Store
sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate CriticalUpdateInstall -boolean FALSE

View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
# Will install virtual env for python
sudo pip install virtualenv

View File

@@ -0,0 +1,2 @@
proxy=http://proxy.intra.qt.io:3128

View File

@@ -0,0 +1 @@
network_test_server_ip=10.212.2.216

View File

@@ -0,0 +1,19 @@
# This file holds all python3 packages need for a certain qt module
# When adding new packages here, first add a comment with the name of the module
# Then all the packages. Duplicates are wanted as every module should install
# all packages it needs and shouldn't depend on a package from another module
#
# qtivi
antlr4-python3-runtime==4.7.1
argh==0.26.2
click==6.7
coloredlogs==10.0
humanfriendly==4.15.1
Jinja2==2.10
MarkupSafe==1.0
path.py==11.0.1
pathtools==0.1.2
PyYAML==3.13
six==1.11.0
typing==3.6.4
watchdog==0.8.3

View File

@@ -0,0 +1,63 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# A helper script used for downloading a file from a URL or an alternative
# URL. Also the SHA1 is checked for the file. Target filename should also
# be given.
#
# If called directly from another script, it will exit the parent script
# as well, if not called in its own subshell with parentheses.
set -ex
function DownloadURL {
url=$1
url_alt=$2
expectedSha1=$3
targetFile=$4
echo "Downloading from primary URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || {
echo "Failed to download '$url' multiple times"
echo "Downloading from alternative URL '$url_alt'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; }
}
echo "Checking SHA1 on PKG '$targetFile'"
echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"
sha1sum --check "$targetFile.sha1"
rm -f "$targetFile.sha1"
}

View File

@@ -0,0 +1,82 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
set -ex
# shellcheck source=DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
function InstallFromCompressedFileFromURL {
url=$1
url_alt=$2
expectedSha1=$3
installDirectory=$4
appPrefix=$5
basefilename=${url##*/}
extension=${basefilename##*.}
filename=${basefilename%.*}
if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
extension="tar.gz"
fi
echo "Extension for file: $extension"
echo "Creating temporary file and directory"
targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension")
targetDirectory=$(mktemp -d)
DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
echo "Uncompress $targetFile"
case $extension in
"tar.gz")
tar -xzf "$targetFile" --directory "$targetDirectory"
;;
"zip")
unzip "$targetFile" -d "$targetDirectory"
;;
"xz")
tar -xf "$targetFile" --directory "$targetDirectory"
;;
*)
exit 1
;;
esac
echo "Moving app to $installDirectory"
sudo mkdir -p "$installDirectory"
sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory"
echo "Removing file '$targetFile'"
rm "$targetFile"
echo "Removing directory '$targetDirectory'"
rm -rf "$targetDirectory"
}

View File

@@ -0,0 +1,51 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# A helper script used for setting environment variables on Unix systems
set -ex
function SetEnvVar {
name=$1
path=$2
echo "Setting environment variable $name to $path."
if uname -a |grep -q "Ubuntu"; then
echo "export $name=$path" >> ~/.profile
else
echo "export $name=$path" >> ~/.bashrc
fi
}

View File

@@ -0,0 +1,40 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
set -ex
# shellcheck source=../shared/http_proxy.txt
source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
{ wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy; } || echo "Proxy not detected at $proxy"

View File

@@ -0,0 +1,40 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
set -ex
echo "Disable Network Time Protocol (NTP)"
echo "sudo launchctl unload /System/Library/LaunchDaemons/org.ntp.ntpd.plist" >> /Users/qt/.bash_profile

View File

@@ -0,0 +1,81 @@
#!/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$
##
############################################################################
# shellcheck source=../unix/DownloadURL.sh
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
# shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
set -ex
breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
targetBreakpad="/tmp/$breakpad_tar"
targetSyscall="/tmp/$linux_syscall_support_tar"
installFolder="$HOME"
breakpadHome="$HOME/breakpad"
# shellcheck disable=SC2015
( DownloadURL "$breakpad_tar_url" "$breakpad_tar_url" "$breakpad_tar_sha" "$targetBreakpad" ) && (
DownloadURL "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_sha" "$targetSyscall"
) && (
tar -xzf "$targetBreakpad" -C "$installFolder"
tar -xzf "$targetSyscall" -C "/tmp"
mv "/tmp/linux-syscall-support/" "$breakpadHome/src/third_party/lss/"
rm -rf $targetBreakpad
rm -rf $targetSyscall
) || (
cd "$HOME"
git clone https://chromium.googlesource.com/breakpad/breakpad "$breakpadHome"
git clone https://chromium.googlesource.com/linux-syscall-support "$breakpadHome/src/third_party/lss"
cd "$breakpadHome"
git checkout "$breakpad_commit_sha"
cd "$breakpadHome/src/third_party/lss"
git checkout "$linux_syscall_support_commit_sha1"
)
SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt

View File

@@ -0,0 +1,75 @@
#!/usr/bin/env bash
#############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# This script will install Google's Protocal Buffers which is needed by Automotive Suite
version="3.6.1"
sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
targetDir="$HOME/protobuf-$version"
targetFile="$targetDir.zip"
DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
unzip "$targetFile" -d "$HOME"
sudo rm "$targetFile"
# devtoolset is needed when running configuration
if uname -a |grep -qv "Darwin"; then
export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
fi
echo "Configuring and building protobuf"
cd "$targetDir"
if uname -a |grep -q Darwin; then
./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local"
SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin"
else
./configure
fi
make
sudo make install
# Refresh shared library cache if OS isn't macOS
if uname -a |grep -qv "Darwin"; then
sudo ldconfig
fi
sudo rm -r "$targetDir"

View File

@@ -0,0 +1,78 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
# The Clang library (C-bindings), version 3.9 or higher is required for building.
# This same script is used to provision libclang to Linux and macOS.
# In case of Linux, we expect to get the values as args
set -e
# shellcheck source=./check_and_set_proxy.sh
source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
# shellcheck source=./SetEnvVar.sh
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
# shellcheck source=./DownloadURL.sh
source "${BASH_SOURCE%/*}/DownloadURL.sh"
libclang_version=6.0
if uname -a |grep -q Darwin; then
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z"
sha1="0af8ab8c1174faf4b721d079587190fc32ea8364"
else
version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
sha1="ef59b699f4fcce2e45108b3ff04cc7471c1c4abe"
fi
zip="/tmp/libclang.7z"
destination="/usr/local/libclang-$version"
DownloadURL $url_cached $url $sha1 $zip
7z x $zip -o/tmp/
rm -rf $zip
sudo mv /tmp/libclang "$destination"
echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
echo "libClang = $version" >> ~/versions.txt
# This is a hacked static build of libclang which requires special
# handling on the qdoc side.
SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1"

View File

@@ -0,0 +1,55 @@
#!/bin/bash
#############################################################################
##
## 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$
##
#############################################################################
# This script installs paho testing broker
# shellcheck source=./InstallFromCompressedFileFromURL.sh
source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
targetFolder="/opt/paho_broker"
appPrefix="paho.mqtt.testing-$CommitSHA"
sudo rm -fr "$targetFolder"
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
echo "Adding MQTT broker path to environment"
SetEnvVar "MQTT_TEST_BROKER_LOCATION" "$targetFolder/interoperability/startbroker.py"
echo "MQTT_BROKER = $CommitSHA" >> ~/versions.txt

View File

@@ -0,0 +1,173 @@
#!/usr/bin/env bash
#############################################################################
##
## 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$
##
#############################################################################
set -ex
# This script will install squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
version="6.4.3"
# Branch version without dot
qtBranch="512x"
squishFolder="/opt/squish"
squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
squishFile="squish-$version-qt$qtBranch-linux64.run"
if uname -a |grep -q Darwin; then
squishFile="squish-$version-qt$qtBranch-macx86_64.dmg"
fi
squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
squishLicenseFile=".squish-3-license.tar.gz"
testSuite="suite_test_squish"
testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
# These checks can be removed when Vanilla OS for all linux and Mac are in
if [ -d "$squishFolder" ]; then
echo "Move old squish to /tmp"
sudo mv "$squishFolder" "/tmp/squish_$(date)"
fi
if [ -f "/etc/profile.d/squish_env.sh" ]; then
echo "Remove /etc/profile.d/squish_env.sh"
sudo rm -f "/etc/profile.d/squish_env.sh"
export SQUISH_LICENSEKEY_DIR=$HOME
fi
function MountAndInstall {
url=$1
targetDirectory=$2
targetFile=$3
# Check which platform
if uname -a |grep -q Darwin; then
usersGroup="staff"
mountFolder="/Volumes"
squishLicenseDir="/Users/qt"
elif uname -a |grep -q "el7"; then
usersGroup="qt"
mountFolder="/tmp"
squishLicenseDir="/root"
elif uname -a |grep -q "Ubuntu"; then
usersGroup="users"
mountFolder="/tmp"
squishLicenseDir="/home/qt"
else
usersGroup="users"
mountFolder="/tmp"
squishLicenseDir="/root"
fi
function UnMount {
echo "Unmounting $mountFolder"
sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
}
targetFileMount="$mountFolder"/"$targetFile"
echo "Mounting $url to $mountFolder"
sudo mount "$url" "$mountFolder"
echo "Create $targetDirectory if needed"
if [ ! -d "/opt" ]; then
sudo mkdir "/opt"
fi
if [ ! -d "$targetDirectory" ]; then
sudo mkdir "$targetDirectory"
fi
echo "Uncompress $targetFile"
if [[ $targetFile == *.tar.gz ]]; then
if [[ $targetFile == .squish-3-license.* ]]; then
target="$squishLicenseDir"
# Squish license need to be exists also in users home directory, because squish check it before it starts running tests
sudo tar -xzf "$targetFileMount" --directory "$HOME"
else
target="$targetDirectory"
fi
sudo tar -xzf "$targetFileMount" --directory "$target"
UnMount
elif [[ $targetFile == *.dmg ]]; then
echo "'dmg-file', no need to uncompress"
sudo cp $targetFileMount /tmp
UnMount
sudo hdiutil attach "/tmp/$targetFile"
sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
mountFolder="/Volumes/froglogic Squish"
UnMount
elif [[ $targetFile == *.run ]]; then
echo "'run-file', no need to uncompress"
sudo cp $targetFileMount $targetDirectory
UnMount
sudo chmod +x $targetDirectory/$targetFile
sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
sudo rm -fr "$targetDirectory/$targetFile"
if uname -a |grep -q "Ubuntu"; then
sudo mkdir /usr/lib/tcl8.6
sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
fi
else
exit 1
fi
echo "Changing ownerships"
sudo chown -R qt:$usersGroup "$targetDirectory"
sudo chown qt:$usersGroup "$HOME/.squish-3-license"
}
echo "Set commands for environment variables in .bashrc"
if uname -a |grep -q "Ubuntu"; then
echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile
else
echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc
fi
echo "Installing squish license to home directory.."
MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
echo "Installing squish $version.."
MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"
echo "Installing provisioning scripts for squish"
MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz"
echo "Verifying Squish Installation"
if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then
echo "Squish installation tested successfully"
else
echo "Squish test failed! Package wasn't installed correctly."
exit 1
fi

View File

@@ -0,0 +1,60 @@
. "$PSScriptRoot\helpers.ps1"
$scriptsPath = "C:\Python27\Scripts"
Run-Executable "$scriptsPath\pip.exe" "install --upgrade conan==0.24.0"
# Use Qt Project repository by default
Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert"
Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos"
function Run-Conan-Install
{
Param (
[string]$ConanfilesDir,
[string]$BuildinfoDir,
[string]$Arch,
[string]$Compiler,
[string]$CompilerVersion,
[string]$CompilerRuntime,
[string]$CompilerLibcxx
)
if ($CompilerRuntime) {
$extraArgs = "-s compiler.runtime=$($CompilerRuntime)"
}
if ($CompilerLibcxx) {
$extraArgs = "-s compiler.libcxx=$($CompilerLibcxx)"
}
$manifestsDir = "$PSScriptRoot\conan_manifests"
Get-ChildItem -Path "$ConanfilesDir\*.txt" |
ForEach-Object {
$conanfile = $_.FullName
$outpwd = "C:\Utils\conanbuildinfos\$($BuildinfoDir)\$($_.BaseName)"
New-Item $outpwd -Type directory -Force
for ($i = 1; $i -le 5; $i++) {
try {
Push-Location $outpwd
Run-Executable "$scriptsPath\conan.exe" "install -f $conanfile --no-imports --verify $manifestsDir", `
'-s', ('compiler="' + $Compiler + '"'), `
"-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs" `
break;
} catch {
if ($i -eq 5) {
throw "Could not install conan content"
}
} finally {
Pop-Location
}
}
Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
}
}
Write-Output "Conan = 0.24.0" >> ~\versions.txt

View File

@@ -0,0 +1,12 @@
. "$PSScriptRoot\helpers.ps1"
$zip = Get-DownloadLocation "Qt3DStudio-3rdparty-win64-CI.zip"
$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip"
Download $url $url $zip
Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
Extract-7Zip $zip C:\Utils\Qt3DStudio3rdparty
Remove-Item -Path $zip
Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"

View File

@@ -0,0 +1,37 @@
############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
# This script allows the Windows Remote Desktop Access
Run-Executable "reg.exe" "add `"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server`" /v fDenyTSConnections /t REG_DWORD /d 0 /f"

View File

@@ -0,0 +1,67 @@
############################################################################
##
## Copyright (C) 2018 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$
##
#############################################################################
# Requires: 7z, perl and msys
. "$PSScriptRoot\helpers.ps1"
# OpenSSL need to be configured from sources for Android build in windows 7
# 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.2p"
$zip = Get-DownloadLocation ("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
# 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
Write-Output "Android OpenSSL = $version" >> ~/versions.txt

View File

@@ -0,0 +1,109 @@
############################################################################
##
## Copyright (C) 2018 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 installs Android sdk and ndk
# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version $sdkBuildToolsVersion
# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
# That's why we need to use Andoid-21 API version in Qt 5.9.
# NDK
$ndkVersion = "r18b"
$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803"
$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
# SDK
$toolsVersion = "26.1.1"
$toolsFile = "sdk-tools-windows-4333796.zip"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-28"
$sdkBuildToolsVersion = "28.0.3"
$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
$toolsChecksum = "aa298b5346ee0d63940d13609fe6bec621384510"
$toolsFolder = "c:\Utils\Android\tools"
$sdkZip = "c:\Windows\Temp\$toolsFile"
function Install($1, $2, $3, $4) {
$cacheUrl = $1
$zip = $2
$checksum = $3
$offcialUrl = $4
Download $offcialUrl $cacheUrl $zip
Verify-Checksum $zip "$checksum"
Extract-7Zip $zip C:\Utils\Android
}
Write-Host "Installing Android NDK $nkdVersion"
Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder
Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder
Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl
Set-EnvironmentVariable "ANDROID_SDK_HOME" C:\Utils\Android
Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel
if (IsProxyEnabled) {
$proxy = Get-Proxy
Write-Host "Using proxy ($proxy) with sdkmanager"
# Remove "http://" from the beginning
$proxy = $proxy.Remove(0,7)
$proxyhost,$proxyport = $proxy.split(':')
$sdkmanager_args = "--no_https", "--proxy=http", "--proxy_host=`"$proxyhost`"", "--proxy_port=`"$proxyport`""
}
New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses
$licenseString = "`nd56f5187479451eabf01fb78af6dfcb131a6481e"
Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 -InputObject $licenseString
# Get a PATH where Java's path is defined from previous provisioning
[Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process")
cd $toolsFolder\bin\
$sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args'
iex $command
$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
iex $command
cmd /c "dir C:\Utils\android"
Write-Output "Android SDK tools= $toolsVersion" >> ~/versions.txt
Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
Write-Output "Android NDK = $ndkVersion" >> ~/versions.txt

View File

@@ -0,0 +1,56 @@
#############################################################################
##
## 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$
##
#############################################################################
. "$PSScriptRoot\helpers.ps1"
$majorminorversion = "3.6"
$version = "3.6.2"
$zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
Write-Host "Removing old cmake"
Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue
Download $officialurl $cachedurl $zip
Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
Extract-7Zip $zip C:
$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
Rename-Item $defaultinstallfolder C:\CMake
Add-Path "C:\CMake\bin"
Write-Output "CMake = $version" >> ~\versions.txt

View File

@@ -0,0 +1,2 @@
1478728220
conanfile.py: 966eefe972ce7b809cf46722ed4acc8f

Some files were not shown because too many files have changed in this diff Show More