lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-19 02:26:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,171 Commits 120 Branches 272 Tags
2cba97ff973ec2fdb00c19bdc918afcd5e92512c
Commit Graph

5171 Commits

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