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
1,397 Commits 118 Branches 270 Tags
b2d2d7bfff8140b2a629f565a156f26dcd4f8027
Commit Graph

1397 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Liang Qi
e5627e6de3 Update submodules on '5.7' in qt5 
Change-Id: Ifb5d6145b2c4b4bf881cf6414d2b5c76382c8757
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
 2016-10-05 14:38:22 +00:00
Liang Qi
eb78767825 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	coin/provisioning/common/helpers.ps1

Change-Id: I9bf6180f7d2ee1ff1c7722eed3c21d416ba7410e
 2016-10-04 11:10:59 +02:00
Qt Submodule Update Bot
bc65857c58 Update submodules on '5.7' in qt5 
Change-Id: Icb268cea1648c3219be1bb2ac8d9819971e9a033
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-10-02 20:52:35 +00:00
Qt Submodule Update Bot
6ddf18df95 Update submodules on '5.8' in qt5 
Change-Id: I3edb8eeb7f599148ba577aea3c6677e8e6423d69
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-10-01 08:48:43 +00:00
Konstantin Tokarev
680c596ca0 Revert "Changed slash direction in CI_CONAN_BUILDINFO_DIR" 
This actually breaks conan integration in Coin instead of fixing it.

This reverts commit b0b0c9c471.

Change-Id: Ifbdc9dbfd89d5b670221463e6d303691ad45936d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-10-01 06:35:46 +00:00
Liang Qi
792f91dc87 Merge remote-tracking branch 'origin/5.6.2' into 5.6 
Conflicts:
	.gitmodules

Change-Id: Ifffec3df90687a6ad84547bb0f603b0446bf0e9d
 2016-09-30 14:36:23 +02:00
Heikki Halmet
c9d71e9eeb Python to provisioning for Windows 
Installs Python version 2.7.10.
Python is required for building Qt 5 from source. More
specifically qtdeclarative and qtwebkit require it.

Change-Id: I63c8f3294a8a4799df5e52fbd41a36db8686950e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-09-30 08:31:18 +00:00
Liang Qi
a5b6125466 Merge remote-tracking branch 'origin/5.7' into 5.8 
Change-Id: I4060b0ddeb5a77c40b31e1ce1dafd2e878b48e12
 2016-09-30 09:27:59 +02:00
Konstantin Tokarev
77eeee64a4 Upgrade CMake to 3.6.2 
QtWebKit requires CMake >= 2.8.12, while only 2.8.11 is available on
Windows 10 machines.

Task-number: QTQAINFRA-996
Change-Id: I734be4cc36f64dd5aeb243b0fbe4395c75c523b3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-30 07:20:41 +00:00
Simon Hausmann
6fabd34960 Merge remote-tracking branch 'origin/5.6' into 5.7 
Change-Id: Ibf285f0d67fc5125c1c7da6dfc5b62b834d34867
 2016-09-28 16:41:56 +02:00
Qt Submodule Update Bot
657cab9312 Update submodules on '5.7' in qt5 
Change-Id: Id084a6f6a3ce4109beb1f36088afe2914ffa7735
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-28 04:43:38 +00:00
Simo Fält
1148171a5d COIN Provisioning: Install ICU to RHEL 7.2 
Change-Id: I9d99c9e8a10b89f430fd6a07932b9330cfb49726
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-28 04:36:48 +00:00
Simo Fält
06c59b27db COIN Provisioning: Disable selinux in rhel 7.2 
Change-Id: I03c2b70e4c05440c6cf1a6d355f5800c67f62bb7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-28 04:36:40 +00:00
Qt Submodule Update Bot
40399ae1cc Update submodules on '5.8' in qt5 
Change-Id: Ia2e717ea4f71a3032146f3fc8b98f96d141f1f92
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-09-28 04:36:31 +00:00
Qt Submodule Update Bot
5ee2290c0c Update submodules on '5.6' in qt5 
Change-Id: I76cd6f71dd61e2478b73d39163e7fbe4b8f6afe6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-27 04:59:22 +00:00
Konstantin Tokarev
b0b0c9c471 Changed slash direction in CI_CONAN_BUILDINFO_DIR 
Change-Id: I13bea231301f12a3992abc11119fc34543e75ab2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-26 13:51:15 +00:00
Qt Submodule Update Bot
c5557d43ee Update submodules on '5.6.2' in qt5 
Change-Id: I337a9d4897efe57d3ac09d9981bb2b07f96a9d87
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.6.2 		2016-09-25 14:19:10 +00:00
Qt Submodule Update Bot
ec6d9b53b4 Update submodules on '5.7' in qt5 
Change-Id: I10f0169fa184c4f0c297af4b8f8795a711d88e58
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-25 14:00:21 +00:00
Qt Submodule Update Bot
cce1584b78 Update submodules on '5.8' in qt5 
Change-Id: Iec230ba54c75039fe1b0506540e52a598fff2510
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-25 09:53:20 +00:00
Qt Submodule Update Bot
dcc26dafad Update submodules on '5.7' in qt5 
Change-Id: I2a5733b235e381990aa51c87af3d69fa2582541f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-25 09:04:39 +00:00
Qt Submodule Update Bot
233d142e8e Update submodules on '5.6' in qt5 
Change-Id: Ifa9a8c1e59cf8e286c4a52b6936720da76f92073
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-24 22:00:52 +00:00