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

1262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frederik Gladhorn
f4c6a9c97c Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev 2016-06-28 15:58:17 +00:00
Qt Submodule Update Bot
f78835e062 Updated submodules. 
Change-Id: I12a0a7f2f8174541a1d3c572478c3d0fb765a35d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2016-06-28 15:58:12 +00:00
Liang Qi
39a03d3d6a Merge remote-tracking branch 'origin/5.7' into dev 
Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
 2016-06-24 07:10:02 +02:00
Qt Submodule Update Bot
3727ce11ac Updated submodules. 
Change-Id: Icb8aad2382e3106db016485d404d7e8afc987399
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-06-23 20:08:48 +00:00
Qt Submodule Update Bot
e06238e996 Updated submodules. 
Change-Id: I5a29cb5e04135debd8e7293594eb540e6acd23dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-06-21 14:08:07 +00:00
Liang Qi
e205785b5c Merge remote-tracking branch 'origin/5.6' into 5.7 
Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca
 2016-06-20 21:35:34 +02: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
Frederik Gladhorn
8ddc3c1254 Add script to patch QNX SDK headers for Qt atomics 
Applies http://www.qnx.com/download/feature.html?programid=27555
to the QNX SDK on our continuous integration machines.

Change-Id: I6d24b5024b3e5981c30bbf9a26a1bb4dfaca4e80
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
 2016-06-16 08:40:11 +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
Liang Qi
bbe0a01fde Merge remote-tracking branch 'origin/5.6' into 5.7 
Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4
 2016-06-14 20:25:20 +02: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
4f64747383 Updated submodules. 
Change-Id: If1195243a052f8cd20079345dbc7b2783e7bf459
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2016-06-11 07:42:47 +00:00
Liang Qi
e568a942ec Merge remote-tracking branch 'origin/5.7.0' into 5.7 
Conflicts:
	.gitmodules

Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
 2016-06-10 12:32:03 +02:00
Qt Submodule Update Bot
6a4d5e4bc8 Updated submodules. 
Change-Id: Ia6457dbccce18d960274b0a1774c3d646dfbc6b9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-06-07 17:59:57 +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
Qt Submodule Update Bot
801066c40d Updated submodules. 
Change-Id: If3be9830f7bdbb5508e3b3a962afcc7402b433b2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-06-03 06:24:37 +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
Qt Submodule Update Bot
e96f60a228 Updated submodules. 
Change-Id: I5093e1ed41b58628b9a67e3bc8c9ed737c9e5523
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
v5.7.0-rc1 		2016-05-30 10:07:21 +00:00
Qt Submodule Update Bot
4e02d96116 Updated submodules. 
Change-Id: I89a5dc174641a9e4fc7c99e31794c92575179c49
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-05-30 08:13:51 +00:00
Qt Submodule Update Bot
0c66994ae9 Updated submodules. 
Change-Id: Ia44a5bc2e6e42cd00524dc82c01d5f59726475f3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2016-05-28 07:36:05 +00:00
Simon Hausmann
ad474f110f Fix status of qtquick1 and enginio 
The right term is "ignore" in order to ignore the module, not "ignored".

Change-Id: Idd4a887834fc98fffb2b9e8385308aa676ba3adf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2016-05-26 23:13:14 +00:00
Jani Heikkinen
30f22b8351 Set qtquick and enginio to ignored state 
It was agreed at the Qt Contributor Summit 2015 that QtQuick1 will be
removed completely from the packages and not even compiled during
qt5.git integration.

Enginio is also removed from 5.7.0 so ignoring it as well

Change-Id: I80ac88d28f811fbf731e33d4d4353a249ad6d29a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2016-05-24 11:53:12 +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
Qt Submodule Update Bot
4ace6667f2 Updated submodules. 
Change-Id: I32a473f951d4c00b98263d570ebadbd368fa78ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-05-18 19:18:50 +00:00
Oswald Buddenhagen
23824d231b Adjust submodule branches 
Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
 2016-05-13 13:28:52 +02:00
Oswald Buddenhagen
777967f97b Merge remote-tracking branch 'origin/5.6' into 5.7 
skipped all sha1 updates.

Change-Id: I1f741cf7bea806ab238b4f1b5585bb440dafd4f7
 2016-05-13 13:22:16 +02:00
Qt Submodule Update Bot
868e545eb2 Updated submodules. 
Change-Id: Iac472068ce186e1e1a0a8a58c7050451171eee37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-05-11 18:54:26 +00:00
Qt Submodule Update Bot
9812986913 Updated submodules. 
Change-Id: I092e0b94eb77397708ab6d196357ec6b3b141326
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-05-11 13:58:19 +00:00
Qt Submodule Update Bot
c07377e739 Updated submodules. 
Change-Id: I5ea896b0ec6b9837fda44eb7b7a61aa3c6e42db5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-05-09 04:09:45 +00:00
Frederik Gladhorn
cef159accd Add script to install freeopcua on Ubuntu 14.04 
Change-Id: Ia13362cf9aa17fbc0e85ac61b1f2897101903aaf
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-05-06 10:43:53 +00:00
Oswald Buddenhagen
a1ec8795c6 make it actually possible to specify 'ignore' as a class 
another thing the doc claims to be possible - also quite reasonably.

Change-Id: I2220245b10f02a778345b6549e345b2486630ffd
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-05-05 20:02:39 +00:00
Oswald Buddenhagen
c41d854254 make it actually possible to exclude classes 
the doc - quite reasonably - claims that it is possible.

Change-Id: I4668b3feafe721f1db4deb65848206d8197962c8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-05-05 20:02:38 +00:00
Qt Submodule Update Bot
9b9801b7d4 Updated submodules. 
Change-Id: I6230a59c886114184d74ad34651f04f0d296ade0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-05-05 05:40:27 +00:00
Frederik Gladhorn
3afd172a25 Merge remote-tracking branch 'origin/5.6' into 5.7 
Change-Id: If598cf5987b52450a43fab93702b717c96b17ad2
 2016-04-28 12:25:11 +02:00
Jędrzej Nowacki
3963056f63 Add script that install icu on RHEL 6.6 
That is translation from coin-setup golang code to sh script

Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
 2016-04-28 07:54:50 +00:00
Frederik Gladhorn
54f1bfd10c Add script to install jom through powershell 
Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
 2016-04-28 07:54:48 +00:00
Frederik Gladhorn
2aff311423 Add coin provisioning directory 
Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2016-04-26 15:50:53 +00:00
Qt Submodule Update Bot
d61ac6c2f0 Updated submodules. 
Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-04-25 08:15:10 +00:00