lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 10:09:15 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,425 Commits 120 Branches 272 Tags
efdd6f944b392d4fda1e984040744acd4fd5318e
Commit Graph

4425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
v5.12.0-beta1 		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
4e8b5bae5b Update submodules on 'dev' in qt5 
Change-Id: I075115b833822c74887629fdde4f21d5ddc57f72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-10-01 09:31:24 +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
cc5b03d6ca Update submodules on 'dev' in qt5 
Change-Id: Ie1f9ff96a8cabdfa01d4f6d26aedc49d81f8cb3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-30 15:28:43 +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
Tony Sarajärvi
5e3511c0c6 Remove Ubuntu 16.04 from the CI 
This one also removes the provisioning scripts
for both x64 and x86 envs.

Task-number: QTQAINFRA-2182
Change-Id: I56f109e4600f46a4d11de8d2dbdcdcd08cb896f3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-09-27 06:49:07 +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
Liang Qi
a03ecaa7fd Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: I433d7f0d4fd69509acc405b3de3979426dbbc660
 2018-09-16 16:39:28 +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
291aa4d366 Update submodules on 'dev' in qt5 
Change-Id: I5df6396153e09c7505cb2acb9c8d541c7b8311a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-16 13:30:23 +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>
v5.11.2 		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
Qt Submodule Update Bot
1cfe79db61 Update submodules on 'dev' in qt5 
Change-Id: I00ff4d749b6a51a005be8abae10a14fbc3209ed9
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-13 05:14:38 +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>
v5.12.0-alpha1 		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
Qt Submodule Update Bot
fd4e4cceff Update submodules on 'dev' in qt5 
Change-Id: Id3bf837247352541b72660b76e2a6dbaa807622f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-09 11:39:40 +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
Qt Submodule Update Bot
a54910a07e Update submodules on 'dev' in qt5 
Change-Id: I74b5ef2e3e68abf3cdb2e10277b43c00a6c22c52
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2018-09-07 02:31:14 +00:00
Qt Submodule Update Bot
8c1b4757fd Update submodules on 'dev' in qt5 
Change-Id: If8edd2c5bfd297a6f13710cf5bea250488c862b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-09-06 21:10:02 +00:00