lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-20 11:56:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,408 Commits 120 Branches 274 Tags
678fcb4e66763a4352e1fe0a1a423d09e38d7a8c
Commit Graph

1408 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Qt Submodule Update Bot
3f7e68f8c0 Update submodules on '5.6' in qt5 
Change-Id: I66d3689ab56b1b8b1c754ced12456ff7e86052f7
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-24 04:30:02 +00:00
Qt Submodule Update Bot
0ad453a0fd Update submodules on '5.6.2' in qt5 
Change-Id: I47372eb19e0f038e1ec1999a183125ed1c5300c7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-09-23 09:12:36 +00:00
Qt Submodule Update Bot
7c6a3f423a Update submodules on '5.7' in qt5 
Change-Id: I0471e3be4be3b6109fe2afab79ba26915eede933
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-23 08:23:40 +00:00
Liang Qi
891afe7066 Update submodules on '5.7' in qt5 
Change-Id: Ibdccfa62d894d5e2b3a72bf09d72b4c9c7ff1981
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-20 20:47:42 +00:00
Qt Submodule Update Bot
6a8a0abf9e Update submodules on '5.6' in qt5 
Change-Id: Id7fba5c79f44c2081ed49ce8f7050b8eacfb76ef
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-18 09:07:30 +00:00
Konstantin Tokarev
23d1112839 Fixed value of CI_CONAN_BUILDINFO_DIR variable when provisioning Windows 
Change-Id: I841783122edf82739826cc0a7672d8c809870e97
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-18 05:57:54 +00:00
Konstantin Tokarev
e1bfa77391 Do not use qmake and cmake generator automatically for each conanfile 
Keep conanfiles self-contained. "txt" generator is not going to be used
by coin internally, drop it.

Task-number: QTQAINFRA-998
Change-Id: I80ffb7342e07d8ef883bed6de77ac9646479f145
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-17 11:06:44 +00:00
Konstantin Tokarev
fd6fe04cad Added cmake_installer, imports and explicit library types to conanfiles 
Task-number: QTQAINFRA-997
Change-Id: I70b51a47c12928944d9f48be13332fce12296af1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-17 11:06:40 +00:00
Konstantin Tokarev
0958cc4cca Changed BuildinfoDir of conan to use Coin-compatible compiler name 
Task-number: QTQAINFRA-998
Change-Id: Ica31bf88055cb46eb9b6a0438ba5df461b6c8e5f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-17 11:06:35 +00:00
Qt Submodule Update Bot
efc461a174 Update submodules on '5.6.2' in qt5 
Change-Id: I623adf43a36ff5cd8de844ae533063523efe2b02
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-09-16 18:30:36 +00:00
Konstantin Tokarev
78a764ee65 Install conan dependencies if there is conanfile.txt for module 
Change-Id: Ie331331f6383444c4329e7a57cb8a8b25e58bd2f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-14 22:31:17 +00:00