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,239 Commits 118 Branches 270 Tags
792f91dc8754ea906eea1268f55e66256c2c97a9
Commit Graph

1239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Qt Submodule Update Bot
388494d7ee Updated submodules. 
Change-Id: I5a780a47ccfcea17e64eda0ed922ca57079ea0ea
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-25 02:39:35 +00:00
Qt Submodule Update Bot
fdbccea88a Updated submodules. 
Change-Id: I67cbc0f3327aeaf3c84e2eb52432a362f0e7c64a
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-06-23 12:34:18 +00:00
Sze Howe Koh
49f1a7f0a6 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 
See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771

Change-Id: Iebda5d9a886f4c0f16fe4906cf6dc4c81f2c3c90
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2016-06-20 16:35:21 +00:00
Qt Submodule Update Bot
0b10bd3657 Updated submodules. 
Change-Id: Ia5d6e51574251dbd0e9f9cf3f41aac2de56471c4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-20 16:35:18 +00:00
Qt Submodule Update Bot
02df76bf07 Updated submodules. 
Change-Id: I3d25d26bebe88a542f794c29bcda413302432874
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-18 15:25:48 +00:00
Qt Submodule Update Bot
6bed56a680 Updated submodules. 
Change-Id: I86dfc95bd06101ed826d139fd577ccfa662ad0b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-17 13:52:32 +00:00
Frederik Gladhorn
0536b1e9e4 Clean up Windows provisioning scripts 
The execution policy is set by the CI. The command usually fails as it
is in the scritps right now since it must be run as admin.

Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
 2016-06-16 10:15:18 +00:00
Qt Submodule Update Bot
b3bc77fc73 Updated submodules. 
Change-Id: Ia573d0de926441bc63b4c3871e075eb342e294c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-16 04:26:54 +00:00
Kai Koehne
9b6d296096 README: Do not take deprecated modules as an example 
Task-number: QTBUG-54084
Change-Id: I03c81822a05fb9a3bda975421228b460c2a00fe2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-06-14 16:20:56 +00:00
Kai Koehne
5778d17a68 README: Remove platform specific build requirements 
The list is not up to date (e.g. ICU is not required on Windows anymore),
and woefully incomplete. Better just link to the wiki/documentation.

Task-number: QTBUG-54084
Change-Id: I6b22fc1c84d40b892503085cb023a7db25fd19c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-06-14 16:20:53 +00:00
Qt Submodule Update Bot
70b3b02977 Updated submodules. 
Change-Id: I8358eadfea5f3bf8ff8615d3c468201acd58f1b5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-14 16:20:50 +00:00
Qt Submodule Update Bot
451f93e26b Updated submodules. 
Change-Id: I5ad7c931f77a167ca4574fd20eb6fe783d95a297
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-12 17:43:06 +00:00
Qt Submodule Update Bot
51cf8dcf3b Updated submodules. 
Change-Id: Iec9d13ae71c8660baec5ca6cfee57aeee3b33922
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-05 11:04:42 +00:00
Erik Verbruggen
3529d894ba OSX: Switch crash reporting to server mode. 
Meaning: to unattended use, so no crash dialogs will pop up. In a later
change we can suppress QTest from generating stack traces when this
setting is *not* in server mode (meaning: the OS will take care of the
stack traces).

Change-Id: Idee9311f866228cd35ecb07889f1c19424981221
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2016-06-02 14:37:12 +00:00
Jędrzej Nowacki
928c491397 Export CI_JOM_PATH variable on all templates with jom 
That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.

Change-Id: I0bc5c76717e994824b85a4353a7218db4b648344
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2016-05-30 14:08:24 +00:00
Jędrzej Nowacki
a97874523f Export CI_ICU_PATH variables on all windows templates 
That is needed to change provisioning way in Coin, as currently it
depends on variables hard-coded in Coin agent.

Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2016-05-30 14:08:22 +00:00
Jędrzej Nowacki
2be9656332 Coin provisioning: overwrite files while unzipping 
Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2016-05-30 14:08:20 +00:00
Qt Submodule Update Bot
82873b1b1e Updated submodules. 
Change-Id: Iec0cece6ec1ca471593c4acd32595b59dc64a651
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-05-30 13:30:27 +00:00
Ilia Kirianovskii
9443890d60 Fix git_install_hooks for relative gitdir 
Previously we expected gitdir to be always absolute. This patch fixes
git_install_hooks in case of relative gitdir.

Change-Id: Ia0883af18229703aaa22c62fd2181ed56d9f2fce
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2016-05-24 04:39:24 +00:00
Qt Submodule Update Bot
e50f5b9150 Updated submodules. 
Change-Id: I9b4f1c3daedf21ab201027d5793aa162710c84af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-05-21 06:44:36 +00:00