lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-09-04 08:17:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,208 Commits 123 Branches 283 Tags
e23b244494a4fa2a5ed449cc32bbb06bb551f57e
Commit Graph

1208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qt Submodule Update Bot e23b244494 Updated submodules. 
Change-Id: I875e16060956af433e20acff4fbdcfb54d0d9923
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-04-13 14:00:35 +00:00
Qt Submodule Update Bot 273e5b82cf Updated submodules. 
Change-Id: Idc9529f02cc9a5ad4cd300a745b559fea9c94ed4
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-04-11 06:57:46 +00:00
Jani Heikkinen 7251401281 Update 5.7 module status 
In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore

Change-Id: I019f76162cfcc853b542695245a983f151f1b072
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
 2016-04-11 06:57:42 +00:00
Liang Qi 5758a88e59 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	.gitmodules

Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
 2016-04-05 09:52:18 +02:00
Qt Submodule Update Bot e80d89059c Updated submodules. 
Change-Id: I983429d487f7667c36553d24037639abee660b42
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-04-04 13:21:35 +00:00
Qt Submodule Update Bot a550ad21bf Updated submodules. 
Change-Id: I1c0bcd2c582276c04e44e88169807cc7cf5b43c3
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-04-04 07:23:53 +00:00
Liang Qi c80e96bb09 Merge remote-tracking branch 'origin/5.6.0' into 5.6 
Conflicts:
	.gitmodules

Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
 2016-03-31 09:53:10 +02:00
Qt Submodule Update Bot f05fece2f7 Updated submodules. 
Change-Id: I85bb46a7180a32c1808574d0a54c51703d4cee12
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-03-29 10:38:52 +00:00
Qt Submodule Update Bot d9beab9abd Updated submodules. 
Change-Id: Ie0c625f6a48fe8d05150bd12f4d92beb2a359ec7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-03-29 04:19:17 +00:00
Qt Submodule Update Bot 20dcf55e7d Updated submodules. 
Change-Id: I5622046dbc1f8eee0cda929627fb8873d525b02a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
v5.7.0-alpha1 		2016-03-08 18:24:09 +00:00
Iikka Eklund 84a1676ed6 Update .gitmodules for automated release src package creation 
Introduce new "deprecated" value for status attribute.

We have two flavors of big source packages we need to produce:

qt-everywhere-* which needs to include:

 - essential
 - addon
 - preview
 - deprecated (e.g. qtscript and qtenginio for Qt5.6 release)

Installer only specific source package:

 - essential
 - addon

 The rest (deprecated, preview, ...) need to be shown as split src
 packages in the installer.

The above leads to the following changes:

qtscript: addon -> deprecated

 Needs to be part of big src packages but excluded from installer
 specific big source package.

qtenginio: obsolete -> deprecated

 We can't exclude this module from qt-everywhere src packages.

qtwayland: preview -> addon

 Needs to be part of installer specific big src package and the
 module status is not preview anymore.

Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
v5.6.0 		2016-03-08 17:54:29 +00:00
Qt Submodule Update Bot 5e15831271 Updated submodules. 
Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-03-04 04:26:10 +00:00
Qt Submodule Update Bot 53b920dc69 Updated submodules. 
Change-Id: I94c3646dc3309f71f577c6f41241cb2570d0c598
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-03-03 10:05:02 +00:00
Qt Submodule Update Bot d74af1270a Updated submodules. 
Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-03-03 00:11:54 +00:00
BogDan Vatra 534d63e652 QQC2 doesn't depend on QQC1 
QQC2 depends on qtgraphicaleffects.

Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
 2016-02-28 06:41:54 +00:00
Qt Submodule Update Bot e6076450e1 Updated submodules. 
Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-02-27 20:21:00 +00:00
Qt Submodule Update Bot e785abbec1 Updated submodules. 
Change-Id: Id60487a24eb193207d4d8837a91cef1abc19f97f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-02-25 18:49:52 +00:00
Qt Submodule Update Bot 211080722e Updated submodules. 
Change-Id: I633ba6875269578aae2f9d28062d3fa78924a5fc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-02-24 15:41:25 +00:00
Simon Hausmann 30236c3f15 Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7 2016-02-24 15:41:16 +00:00
BogDan Vatra 18e84e7c06 Enable QtGamepad usage in Qt3D 
If Qt3D finds QtGamepad, it will use it to build gamepad support.

Change-Id: Ifbc40e5e04a6030d25c2d429878d4fb3a3dd11a6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
 2016-02-22 12:40:29 +00:00
Simon Hausmann d4bb786963 Merge remote-tracking branch 'origin/5.6' into 5.7 
Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
 2016-02-19 09:21:52 +01:00
Qt Submodule Update Bot fb1345171a Updated submodules. 
Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
v5.6.0-rc1 		2016-02-19 05:24:28 +00:00
Oswald Buddenhagen fdf1b3cc8d rework hook installation 
the primary purpose of this change is making it work with new-style
submodules (1.7+) and git-worktree (2.5+). this means resolving '.git'
and 'commondir' files.

we avoid calling git commands, because a) it's slow on windows, b) some
of them are unavailable in older git versions and it's tedious to deal
with that and c) their output is not necessarily optimal (not always
absolute paths).

we also don't use relative paths for the hook locations any more, as
that's too tedious to deal with.

Change-Id: Ie341e748e56d6bef40856e4a49ac368850028d83
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-02-17 20:18:48 +00:00
Qt Submodule Update Bot c2549708e5 Updated submodules. 
Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-02-17 20:18:34 +00:00
Qt Submodule Update Bot 6bdec75429 Updated submodules. 
Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-02-16 12:15:51 +00:00
Qt Submodule Update Bot 6efabf6dfe Updated submodules. 
Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
 2016-02-15 10:26:46 +00:00
Qt Submodule Update Bot 3fa8726fa7 Updated submodules. 
Change-Id: I5861620b6214dc5ff124672ce21dd4dd5b25ce85
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-02-15 06:57:00 +00:00
Oswald Buddenhagen 81523d838c Adjust submodule branches 
Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430
 2016-02-12 17:40:00 +01:00
Qt Submodule Update Bot 7a8c874231 Updated submodules. 
Change-Id: I6901259b7a01e57d0c8ca2a9f40d9501635f5cc0
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-02-12 11:11:07 +00:00
Simon Hausmann e52c7efa4c Fix datavis3d dependencies 
The qtmultimedia dependency was missing for datavis3d.

Change-Id: I91007c210e58aa9985844a8234781356391bfbad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
 2016-02-12 11:11:01 +00:00
Oswald Buddenhagen c6d04d68bd add qtgamepad, qtscxml, and qtspeech 
Change-Id: I14bc475d44367a9102e896976eba5bd191ee232d
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-02-12 11:10:57 +00:00
Oswald Buddenhagen 4007fc7a26 Merge remote-tracking branch 'origin/5.6.0' into 5.6 
Conflicts:
	.gitmodules

Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
 2016-02-12 11:18:27 +01:00
Qt Submodule Update Bot 37c75a23e8 Updated submodules. 
Change-Id: I8740e98ba27c1f554366a5183c6972207f0b0061
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
 2016-02-10 23:22:34 +00:00
Oswald Buddenhagen 3cfe8712ae fix branches of some modules 
all repos which are released (whichever way) need release branches.
and vice versa.
also, it needs to be the *right* release branch.

Task-number: QTBUG-50695
Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-02-07 09:10:14 +00:00
Qt Submodule Update Bot b680c074d1 Updated submodules. 
Change-Id: Ic407bd126cc4c0a557ec7769d41394aa68c0cbee
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-02-07 09:09:35 +00:00
Oswald Buddenhagen d1d52b5c1e properly complain about invalid entries in --module-subset 
Change-Id: I13ec7a6acdc8a47efea14bfabf0413d8a3570870
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-02-07 09:09:30 +00:00
Oswald Buddenhagen 3de19487d9 replace 'initrepo' with more fine-grained 'status' 
instead of a simple bool, we now have five states: preview, active,
addon, obsolete, and ignore (the default). the default includes the
first three.

the CI system is expected to use --module-subset=all,-ignore to include
everything that is expected to build (in some configurations).

Change-Id: Ifb43412054a8e42db0425f24f8e53acfce363caa
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-02-07 09:09:27 +00:00
Miikka Heikkinen 2c53e3d08c Add charts, data visualization and virtual keyboard modules 
Change-Id: I53cbc4ce3c2e44687ce454498f5def820614db85
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-01-25 14:41:07 +00:00
Oswald Buddenhagen f5ba19c3f0 Adjust submodule branches 
Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048
 2016-01-25 11:38:54 +01:00
Qt Submodule Update Bot b93073ecc9 Updated submodules. 
Change-Id: I790e982492004e93953bed503a1d777d27c28b6f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-01-23 11:12:30 +00:00
Qt Submodule Update Bot 1fcdb6cafc Updated submodules. 
Change-Id: I88b34da37a589451ae32c6f736f4dc863715b339
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-01-22 19:11:52 +00:00
Simon Hausmann d758a3b055 Merge remote-tracking branch 'origin/5.6' into dev 
Change-Id: I62519dfde84c16a7dfe1b6f225e40e6f16d3105c
 2016-01-22 10:42:38 +01:00
Qt Submodule Update Bot 273821d69c Updated submodules. 
Change-Id: I2c671f50d878e8ed03418c2a59c8c997ed3bd6f4
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-01-22 04:26:30 +00:00
Oswald Buddenhagen 06c3d40cc9 move module dependencies from qt.pro to .gitmodules 
this removes the last redundant module list.

the module build order which is not determined by dependencies is pretty
random now. this is avoided for a few heavy and "less relevant" modules
by setting a priority to built them as late as possible.

Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-01-22 04:26:12 +00:00
Qt Submodule Update Bot f47e82703c Updated submodules. 
Change-Id: Ie0cf0058a5e8f383be4608a5c094b610b9a575af
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-01-19 19:11:07 +00:00
Qt Submodule Update Bot bb9eebce48 Updated submodules. 
Change-Id: Ia4dbb4d02b5c32c76cd9cbdc320709af668dc4bc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-01-18 19:58:29 +00:00
Qt Submodule Update Bot 0e2ec253d8 Updated submodules. 
Change-Id: I3ce0cb4e9ea44dcd860b48d3a6ecaad0eb31964f
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2016-01-17 17:40:06 +00:00
Qt Submodule Update Bot 63d305bb7d Updated submodules. 
Change-Id: Iff91870d954d24d2649334d2eeb8357e483009b3
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-01-12 19:50:06 +00:00
Qt Submodule Update Bot bcebc106f1 Updated submodules. 
Change-Id: Ibacf35a5fb113f9b54a96c10d52aa70e2e64f8da
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-01-05 12:50:44 +00:00
Oswald Buddenhagen 2e134da46c don't use POD, to restore msysgit perl compatibility 
Change-Id: I360a6d5246e33dcf3f72bc83f2790905af8c1463
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
 2015-12-25 08:07:16 +00:00