lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-19 21:11:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,703 Commits 120 Branches 272 Tags
ce9181a96433e50fe8b5cc79876eeffa6971c2ce
Commit Graph

1703 Commits

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