lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 01:36:32 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,572 Commits 120 Branches 272 Tags
b9b8066d97ccf0bbfd6ae6ec0fcac97ff9a955ce
Commit Graph

2572 Commits

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