lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-10 17:06:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,235 Commits 118 Branches 268 Tags
e568a942ec8d5b25de810cc22f53b45a3078fcfe
Commit Graph

1235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
801066c40d Updated submodules. 
Change-Id: If3be9830f7bdbb5508e3b3a962afcc7402b433b2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2016-06-03 06:24:37 +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
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
Qt Submodule Update Bot
b7c2e9a846 Updated submodules. 
Change-Id: Id24e1017eee9828e7d6245f1241f241662cc48ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-04-21 05:55:42 +00:00
Iikka Eklund
3df0a5837c Update qtquickcontrols2 status as "addon" for Qt 5.7 
qtquickcontrols2 is not in preview state anymore for Qt 5.7.

Change-Id: Ib9d3616e7605beabb9bb9f0b0cb1b79a8d499ebd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
 2016-04-21 05:55:37 +00:00
Qt Submodule Update Bot
499c5390b3 Updated submodules. 
Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2016-04-21 04:26:15 +00:00
Dominik Holland
a9752d68ed Added qtdeclarative and qtmultimedia as optional dependencies for qtspeech 
Change-Id: I20602133a2156b162e99432f868e4925469c7ff5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
v5.7.0-beta1 		2016-04-13 14:00:38 +00:00
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