aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Updated submodulesQt Submodule Update Bot2016-07-0212-0/+0
| | | | | Change-Id: Ie27b2f6daddc68e72b09d779beaf1f61a8a29aa6 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Updated submodulesQt Submodule Update Bot2016-06-307-0/+0
| | | | | Change-Id: I64b5898838652d6a785a45136947f7d55fa3d3f1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/devFrederik Gladhorn2016-06-2831-96/+471
|\
| * Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-2433-96/+471
| |\ | | | | | | | | | Change-Id: I5ed83c8f42be099c545dfdcc96a34f7d33cfcda7
| | * Updated submodules.Qt Submodule Update Bot2016-06-2310-0/+0
| | | | | | | | | | | | | | | Change-Id: Icb8aad2382e3106db016485d404d7e8afc987399 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Updated submodules.Qt Submodule Update Bot2016-06-2131-0/+0
| | | | | | | | | | | | | | | Change-Id: I5a29cb5e04135debd8e7293594eb540e6acd23dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-2017-54/+6
| | |\ | | | | | | | | | | | | Change-Id: I2e0204f745b482e4faa210ec7f8b95463267b3ca
| | | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-204-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: Iebda5d9a886f4c0f16fe4906cf6dc4c81f2c3c90 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | | * Updated submodules.Qt Submodule Update Bot2016-06-208-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia5d6e51574251dbd0e9f9cf3f41aac2de56471c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Updated submodules.Qt Submodule Update Bot2016-06-1818-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I3d25d26bebe88a542f794c29bcda413302432874 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Updated submodules.Qt Submodule Update Bot2016-06-1711-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I86dfc95bd06101ed826d139fd577ccfa662ad0b7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Clean up Windows provisioning scriptsFrederik Gladhorn2016-06-1611-50/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * Updated submodules.Qt Submodule Update Bot2016-06-1612-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia573d0de926441bc63b4c3871e075eb342e294c9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Add script to patch QNX SDK headers for Qt atomicsFrederik Gladhorn2016-06-163-0/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-1414-38/+66
| | |\| | | | | | | | | | | | | Change-Id: I4a97d7f5b12f9f5e082c44dea279e39417ccf1c4
| | | * README: Do not take deprecated modules as an exampleKai Koehne2016-06-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-54084 Change-Id: I03c81822a05fb9a3bda975421228b460c2a00fe2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * README: Remove platform specific build requirementsKai Koehne2016-06-141-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * Updated submodules.Qt Submodule Update Bot2016-06-146-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8358eadfea5f3bf8ff8615d3c468201acd58f1b5 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Updated submodules.Qt Submodule Update Bot2016-06-1216-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I5ad7c931f77a167ca4574fd20eb6fe783d95a297 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Updated submodules.Qt Submodule Update Bot2016-06-0519-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iec9d13ae71c8660baec5ca6cfee57aeee3b33922 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * OSX: Switch crash reporting to server mode.Erik Verbruggen2016-06-024-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * Export CI_JOM_PATH variable on all templates with jomJędrzej Nowacki2016-05-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * Export CI_ICU_PATH variables on all windows templatesJędrzej Nowacki2016-05-306-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * Coin provisioning: overwrite files while unzippingJędrzej Nowacki2016-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | | * Updated submodules.Qt Submodule Update Bot2016-05-3020-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iec0cece6ec1ca471593c4acd32595b59dc64a651 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | | * Fix git_install_hooks for relative gitdirIlia Kirianovskii2016-05-241-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | | * Updated submodules.Qt Submodule Update Bot2016-05-2134-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I9b4f1c3daedf21ab201027d5793aa162710c84af Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| | * | Updated submodules.Qt Submodule Update Bot2016-06-1138-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If1195243a052f8cd20079345dbc7b2783e7bf459 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-101-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ibb7ae7927cfd3371bdb77d88df409e6982e43985
| | | * | Updated submodules.Qt Submodule Update Bot2016-06-074-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia6457dbccce18d960274b0a1774c3d646dfbc6b9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * | Updated submodules.Qt Submodule Update Bot2016-06-0313-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3be9830f7bdbb5508e3b3a962afcc7402b433b2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * | 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
| | * | | Updated submodules.Qt Submodule Update Bot2016-05-1818-0/+0
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I32a473f951d4c00b98263d570ebadbd368fa78ce Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 22:33:27 +0000