lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,457 Commits 118 Branches 270 Tags
9b584a8117b9ef6d4d40eb5042c5ee4df18b2fed
Commit Graph

2457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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>
v5.11.0-beta3 		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