aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodules.v5.7.0-rc1Qt Submodule Update Bot2016-05-302-0/+0
| | | | | Change-Id: I5093e1ed41b58628b9a67e3bc8c9ed737c9e5523 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Updated submodules.Qt Submodule Update Bot2016-05-302-0/+0
| | | | | Change-Id: I89a5dc174641a9e4fc7c99e31794c92575179c49 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Updated submodules.Qt Submodule Update Bot2016-05-2836-0/+0
| | | | | | Change-Id: Ia44a5bc2e6e42cd00524dc82c01d5f59726475f3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Fix status of qtquick1 and enginioSimon Hausmann2016-05-261-2/+2
| | | | | | | | 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>
* Set qtquick and enginio to ignored stateJani Heikkinen2016-05-241-2/+2
| | | | | | | | | | | 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>
* Adjust submodule branchesOswald Buddenhagen2016-05-131-40/+40
| | | | Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812
* Merge remote-tracking branch 'origin/5.6' into 5.7Oswald Buddenhagen2016-05-131-11/+21
|\ | | | | | | | | | | skipped all sha1 updates. Change-Id: I1f741cf7bea806ab238b4f1b5585bb440dafd4f7
| * Updated submodules.Qt Submodule Update Bot2016-05-1116-0/+0
| | | | | | | | | | Change-Id: I092e0b94eb77397708ab6d196357ec6b3b141326 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Updated submodules.Qt Submodule Update Bot2016-05-097-0/+0
| | | | | | | | | | Change-Id: I5ea896b0ec6b9837fda44eb7b7a61aa3c6e42db5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * make it actually possible to specify 'ignore' as a classOswald Buddenhagen2016-05-051-0/+2
| | | | | | | | | | | | | | another thing the doc claims to be possible - also quite reasonably. Change-Id: I2220245b10f02a778345b6549e345b2486630ffd Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * make it actually possible to exclude classesOswald Buddenhagen2016-05-051-11/+19
| | | | | | | | | | | | | | the doc - quite reasonably - claims that it is possible. Change-Id: I4668b3feafe721f1db4deb65848206d8197962c8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-05-0527-0/+0
| | | | | | | | | | Change-Id: I6230a59c886114184d74ad34651f04f0d296ade0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Updated submodules.Qt Submodule Update Bot2016-05-1129-0/+0
| | | | | | | | | | Change-Id: Iac472068ce186e1e1a0a8a58c7050451171eee37 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Add script to install freeopcua on Ubuntu 14.04Frederik Gladhorn2016-05-061-0/+49
| | | | | | | | | | Change-Id: Ia13362cf9aa17fbc0e85ac61b1f2897101903aaf Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Frederik Gladhorn2016-04-2810-0/+151
|\| | | | | | | Change-Id: If598cf5987b52450a43fab93702b717c96b17ad2
| * Add script that install icu on RHEL 6.6Jędrzej Nowacki2016-04-281-0/+70
| | | | | | | | | | | | | | That is translation from coin-setup golang code to sh script Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * Add script to install jom through powershellFrederik Gladhorn2016-04-287-0/+68
| | | | | | | | | | Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
| * Add coin provisioning directoryFrederik Gladhorn2016-04-262-0/+13
| | | | | | | | | | | | Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Updated submodules.Qt Submodule Update Bot2016-04-258-0/+0
| | | | | | | | | | Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * Updated submodules.Qt Submodule Update Bot2016-04-2124-0/+0
| | | | | | | | | | Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Updated submodules.Qt Submodule Update Bot2016-04-2114-0/+0
| | | | | | | | | | Change-Id: Id24e1017eee9828e7d6245f1241f241662cc48ef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Update qtquickcontrols2 status as "addon" for Qt 5.7Iikka Eklund2016-04-211-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | Added qtdeclarative and qtmultimedia as optional dependencies for qtspeechv5.7.0-beta1Dominik Holland2016-04-131-0/+1
| | | | | | | | | | Change-Id: I20602133a2156b162e99432f868e4925469c7ff5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Updated submodules.Qt Submodule Update Bot2016-04-1313-0/+0
| | | | | | | | | | Change-Id: I875e16060956af433e20acff4fbdcfb54d0d9923 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Updated submodules.Qt Submodule Update Bot2016-04-1133-0/+0
| | | | | | | | | | Change-Id: Idc9529f02cc9a5ad4cd300a745b559fea9c94ed4 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | Update 5.7 module statusJani Heikkinen2016-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-052-9/+15
|\| | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: If63e4f4f7d9a7ddba01d4e621fe6bfbc60838d26
| * Updated submodules.Qt Submodule Update Bot2016-04-0415-0/+0
| | | | | | | | | | Change-Id: I983429d487f7667c36553d24037639abee660b42 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-03-312-10/+16
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
| | * Update .gitmodules for automated release src package creationv5.6.0Iikka Eklund2016-03-082-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Updated submodules.Qt Submodule Update Bot2016-03-047-0/+0
| | | | | | | | | | | | | | | Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-03-034-0/+0
| | | | | | | | | | | | | | | Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-02-2711-0/+0
| | | | | | | | | | | | | | | Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.v5.6.0-rc1Qt Submodule Update Bot2016-02-194-0/+0
| | | | | | | | | | | | | | | Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-02-167-0/+0
| | | | | | | | | | | | | | | Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Updated submodules.Qt Submodule Update Bot2016-02-155-0/+0
| | | | | | | | | | | | | | | Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
| * | Updated submodules.Qt Submodule Update Bot2016-03-2934-0/+0
| | | | | | | | | | | | | | | Change-Id: I85bb46a7180a32c1808574d0a54c51703d4cee12 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-04-0411-0/+0
| | | | | | | | | | | | | | | Change-Id: I1c0bcd2c582276c04e44e88169807cc7cf5b43c3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-03-2934-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie0c625f6a48fe8d05150bd12f4d92beb2a359ec7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated submodules.v5.7.0-alpha1Qt Submodule Update Bot2016-03-0812-0/+0
| | | | | | | | | | | | | | | Change-Id: I5622046dbc1f8eee0cda929627fb8873d525b02a Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-03-0317-0/+0
| | | | | | | | | | | | | | | Change-Id: I94c3646dc3309f71f577c6f41241cb2570d0c598 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* | | QQC2 doesn't depend on QQC1BogDan Vatra2016-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | QQC2 depends on qtgraphicaleffects. Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-02-2511-0/+0
| | | | | | | | | | | | | | | Change-Id: Id60487a24eb193207d4d8837a91cef1abc19f97f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Updated submodules.Qt Submodule Update Bot2016-02-2434-0/+0
| | | | | | | | | | | | | | | Change-Id: I633ba6875269578aae2f9d28062d3fa78924a5fc Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7Simon Hausmann2016-02-242-61/+122
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-02-192-61/+122
| |\| | | | | | | | | | | | | | Change-Id: I2bc1389ece7f12efc334f0292edbbea837f9adc2
| | * | rework hook installationOswald Buddenhagen2016-02-171-16/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Updated submodules.Qt Submodule Update Bot2016-02-1740-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | * | Merge remote-tracking branch 'origin/5.6.0' into 5.6Oswald Buddenhagen2016-02-122-40/+82
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ic3c425211f24b0dc3a341cac7d9fd9d0b7edac03
| | | * Updated submodules.Qt Submodule Update Bot2016-02-1013-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8740e98ba27c1f554366a5183c6972207f0b0061 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 19:49:07 +0000