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,259 Commits 118 Branches 270 Tags
c32c2d42388f021a53c6ed9d3f7d7e11fcff20af
Commit Graph

1259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
c32c2d4238 Update submodules on '5.6' in qt5 
Change-Id: I885a6ee78c480bda7f325a21d73d3f95863f9ad4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-11-23 04:19:54 +00:00
Tony Sarajärvi
e0912a9cea Provision OPENSSL env variable for openSUSE 13.1 
Fix building on OpenSuse after openssl update.
Every linux distro seems to patch openssl in a different way to deal with
broken/outdated SSL issues. We seem unable to detect what suse did when
running configure, so this is a stop-gap measure.

Change-Id: I5e375e9c5c1615358dbce0b8dd91476cb4f4e45b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-11-22 14:29:51 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Qt Submodule Update Bot
8cdb619bce Update submodules on '5.6' in qt5 
Change-Id: Id80b5734e19aa6f15d90b11abef9f9c183290292
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-13 18:02:05 +00:00
Eskil Abrahamsen Blomfeldt
25b385764e Add Qt Android Extras as dependency for Qt Purchasing 
Change-Id: Ia7b9d966777470642e0ee0ad3e9c82496ce93950
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
 2016-09-13 10:28:43 +00:00
Heikki Halmet
f1de674fd9 Android sdk and ndk to provisioning for qt5.6 
Install latest Android sdk and ndk.
It also runs update for SDK API level 18, latest SDK- and platform-
tools and build-tools version 23.0.3.
Build-tools version 23.0.3 is the latest usable version
for Red Hat 6. Newer version of build-tools, version 24.x.x,
requires GLIBC_2.14, which is not available in Red Hat 6.

Change-Id: Iddc353674a65e0af7a9036d9296b9c2933fa114f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-09-12 09:47:22 +00:00
Qt Submodule Update Bot
25ee5c337c Update submodules on '5.6' in qt5 
Change-Id: I1f0e77afca353b07420ed8da001cfbbaaa738dce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-06 05:13:43 +00:00
Qt Submodule Update Bot
4faee20713 Update submodules on '5.6.2' in qt5 
Change-Id: Ie03202844e195a89cb536fde6b3c357929737cf8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-09-05 16:47:08 +00:00
Qt Submodule Update Bot
cb6b46a516 Update submodules on '5.6' in qt5 
Change-Id: I34bab96a9ec73aa07e1295250aa85528f306a679
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-09-04 15:16:38 +00:00
Qt Submodule Update Bot
68a5a649ab Update submodules on '5.6' in qt5 
Change-Id: I565078e5d2d1d8b6a9111d3f063eaebafe008c6f
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-09-02 18:06:20 +00:00
Qt Submodule Update Bot
66ffe13b50 Update submodules on '5.6' in qt5 
Change-Id: I45ed20f8f12335ac2d7aa315329a25c8fbac94fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-30 04:00:57 +00:00
Oswald Buddenhagen
9584900b5c Adjust submodule branches 
Change-Id: Ibc4de8e8a06cf2391ae33be2d02fc21f4e3ab70f
 2016-08-24 11:52:19 +02:00
Qt Submodule Update Bot
2dcb31a181 Update submodules on '5.6' in qt5 
Change-Id: I1104beac8bafb324731879efdb752a1cebbb9512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-22 16:37:59 +00:00
Qt Submodule Update Bot
2556777f36 Update submodules on '5.6' in qt5 
Change-Id: I3fbdb4edc4d37a8b25fdaff52853d672c951891d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-16 11:53:15 +00:00
Qt Submodule Update Bot
2ed6386fe3 Update submodules on '5.6' in qt5 
Change-Id: I4821c386e318139e13ad228983c43c1b1d978494
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-13 10:06:10 +00:00
Qt Submodule Update Bot
b0bfbf3bf0 Update submodules on '5.6' in qt5 
Change-Id: I166e0f9a092f7e293d50d7efb12df54bcee5ec13
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-08-10 12:05:33 +00:00
Qt Submodule Update Bot
3fb555a773 Update submodules on '5.6' in qt5 
Change-Id: I32152358542e406f773d106abba25ee5609c6469
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-08-04 22:00:58 +00:00
Tony Sarajärvi
19b472f1ff Fix Coin provisioning in RHEL 6 regarding sslclientkey values 
There was a bug in RHELs subscription manager that caused yum
not to work by fetching incorrect data into the sslclientkey repository
parameter value.
This provisioning script fetches new data for the repository and thus
fixes yum. Naturally by not having a template where a bad repository
exists, this script would be obsolete. Also, as this needs to be run
before any other scripts using yum, prefixes were added to the scripts.

Change-Id: I5c6ed1d43451d2918f9b6dad22b0106339f36aea
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2016-08-03 10:28:52 +00:00
Qt Submodule Update Bot
8a8134e878 Update submodules on '5.6' in qt5 
Change-Id: Ie6bd9ea82d5e67fee7645dccd9b07ceac5755582
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-07-30 07:16:36 +00:00
Qt Submodule Update Bot
6fbf179f73 Updated submodules 
Change-Id: Ia80e4d39f9772e32952685008380cc348f481c6c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-07-04 22:00:50 +00:00
Qt Submodule Update Bot
e00d0be179 Updated submodules 
Change-Id: I5443b0f4d97cfc076e3a642ae78770b38661e983
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-07-04 13:30:37 +00:00
Qt Submodule Update Bot
d445febd14 Updated submodules 
Change-Id: I48fca93fd045323752c79abd2710e9307ea85b3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-07-01 10:35:37 +00:00
Qt Submodule Update Bot
9c2315789d Updated submodules 
Change-Id: I23f310f80837c73fee1fff2618e1253c6b80b74b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-30 05:12:12 +00:00
Qt Submodule Update Bot
7b77cbc4df Updated submodules. 
Change-Id: I5a2524a408eaf6f808c0e1242583e83bf01b42b0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-29 11:59:46 +00:00