Commit Graph

1382 Commits

Author SHA1 Message Date
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
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
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
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
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
d74af1270a Updated submodules.
Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2016-03-03 00:11: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
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
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
Oswald Buddenhagen
f5ba19c3f0 Adjust submodule branches
Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048
2016-01-25 11:38:54 +01: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
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
Oswald Buddenhagen
c3e404fffd don't use GetOptionsFromArray, to restore msysgit perl compatibility
Change-Id: Ic02a5d8b5a8a813a23bed1c0b45bcb8ee47e3edb
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-25 08:07:10 +00:00
Oswald Buddenhagen
43135d6e33 make qtandroidextras a regular optional dependency of qtconnectivity
we want to move to a purely declarative way to declare submodules, so
the conditional has to go.

instead, use an optional dependency to ensure build order, while the
module excludes itself via requires() if its dependency is missing.

Change-Id: I615382700ff601c9ab003d131b2cc600441c514c
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2015-12-25 08:07:00 +00:00
Qt Submodule Update Bot
cda5de797b Updated submodules.
Change-Id: Icf4a1303edde9048adcb9bb40ced1b503a170f22
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-24 18:06:50 +00:00
Simon Hausmann
90b08b1c6d Updated submodules.
Change-Id: I701ce99cb7eb7fa8daffa67699920f51a7ab2087
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-17 06:52:41 +00:00
Simon Hausmann
f8ae5ee3b6 Updated submodules.
Change-Id: I806a9fb4b31adf8c02e00c2320d53f7d7fe3669e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-16 09:49:14 +00:00
Simon Hausmann
a93760f957 Updated submodules.
Change-Id: Iba5d9c28367748258013888c93ab773eb05bb0ee
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
v5.6.0-beta1
2015-12-15 07:35:22 +00:00
Simon Hausmann
d678e02936 Updated submodules.
Change-Id: Ia00cca2d8c22ff96a4f871d70eaa9eb55f6391b0
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-10 05:05:50 +00:00
Antti Kokko
1c04b1f7bd Updated submodules.
Change-Id: Ic83700e48f40b0ee8e76f4b4e44b28b4c85bebb7
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-12-08 04:54:41 +00:00
Oswald Buddenhagen
2a46300588 error-check dependency declarations
Change-Id: I98ad68d8be608b144c5f2ff422aaf7baab9907e8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-12-01 14:00:46 +00:00
Antti Kokko
d527415ac6 Updated submodules.
Change-Id: Id124a31338548d9a76baa908b281b3bb6ede168a
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
2015-12-01 14:00:43 +00:00
Frederik Gladhorn
f128a9a7e1 Updated submodules.
Change-Id: Id3463e24f1aecc6e2d4d040bc7878ad1d48f6327
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-11-16 05:29:51 +00:00
Oswald Buddenhagen
83b45e9030 declare mandatory dep serialbus => serialport
Change-Id: I35c5f18b7c8856071413e50590308f402be7e528
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
2015-11-13 09:22:22 +00:00
Jędrzej Nowacki
1197dbb1db Updated submodules.
Change-Id: I8e348f3cab39f75acb68b2bdc388cd37927424bb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-11-12 19:05:33 +00:00
Frederik Gladhorn
d55a9e3a66 Updated submodules.
Change-Id: I0793599392d2e64ceabe8d0f24ba7cb0abc76b84
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
2015-11-07 14:00:12 +00:00
Jani Heikkinen
4aabf3e19d Updated submodules.
Change-Id: I4f71eed2d556219480490f433323db4c151b4ba7
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
2015-10-31 09:29:59 +00:00
Fredrik Orderud
ddcc9b234e Update Qt3d manually
Fixes a crash at destruction.

Change-Id: Ie773b3def96cc1e55baa36b9ff7cf697770d479e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2015-10-28 20:25:26 +00:00
Simon Hausmann
95a89a8b5a Manual update of qtmultimedia
In order to bring in the missing libs for QTBUG-48914

Change-Id: I678dcd1ca5bdae66efdd09b809ff63c7da37d58a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-27 12:15:41 +00:00
Fredrik Orderud
98717e27d0 Update Qt3d manually
Fixes some nasty threading problems related to pick event race
conditions and QThreadPool thread recycling.

Change-Id: I977ad310d1a767abc0fbcca49f9088ff5fdda708
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-26 18:22:04 +00:00
Simon Hausmann
5197447fd0 Update WebEngine manually
This brings in MSVC 2015 fixes and RHEL/OpenSuSE build fixes

Change-Id: I796c153a005e964c4a32203cfe08cbf3ece5f39e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
2015-10-23 18:46:03 +00:00