lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-17 09:46:08 +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
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
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
7b8fe9c0ed Update submodules on 'dev' in qt5 
Change-Id: I737902b8cc54ce8394c377f6cdafe14c49c2a588
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-10-04 04:57:22 +00: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
Liang Qi
538d7a0538 Update submodules on 'dev' in qt5 
Change-Id: Id24be2272e6fe7256c6f96c1c54c2baf933f793f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-10-01 13:03:28 +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
0e4688d36e Merge remote-tracking branch 'origin/5.8' into dev 
Conflicts:
	.gitmodules

Change-Id: I6f517c976152f2da390c556c7c9da08aaec4be90
 2016-09-30 16:13:52 +02: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