aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.11' in qt5v5.11.0-alpha1Qt Submodule Update Bot2018-02-1539-0/+0
| | | | | Change-Id: Ie33f91194895634fbf837210e534b78e7559989e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove macOS 10.10 from CI for Qt 5.11Jake Petroules2018-02-1010-71/+1
| | | | | | | | As agreed, this version will not be supported any longer. Change-Id: I37d9d9d9e32b5d17dbf0f80a6c42a8e233bcc446 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Remove QtOpcUA from qt5.gitAlex Blasche2018-02-072-6/+0
| | | | | | This module is moved to tqtc-qt5. Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
* Update submodules on '5.11' in qt5Qt Submodule Update Bot2018-02-0718-0/+0
| | | | | Change-Id: I8e2b737f940e5712c49eadf688983607e4ec349c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/dev' into 5.11Liang Qi2018-02-063-2/+1
|\ | | | | | | Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
| * Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-01-312-0/+0
| | | | | | | | | | | | Change-Id: Ie2e621ae2c2387c7daa0c29c5e04c8928fed169b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Swap qtquickcontrols vs. qtquickcontrols2 statusesJ-P Nurmi2018-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | The Qt Quick Controls (1) module, which was still listed as an essential module, has not been actively developed for almost three years. Promote Qt Quick Controls 2 as an essential module instead, and demote Qt Quick Controls (1) as an addon. Change-Id: If51c6c17d199ca10a574053d7dba67539a764aba Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Revert "Adjust submodule branches"Frederik Gladhorn2018-01-311-41/+41
| | | | | | | | | | | | | | | | | | This got merged accidentally. This reverts commit 282899453d2c6b4c51bbd94fc228f2bb711d64f6. Change-Id: I1457513217e636aa54b43a1dc21b01443c798119 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Merge remote-tracking branch 'origin/5.11' into devFrederik Gladhorn2018-01-311-1/+1
| |\ | | | | | | | | | Change-Id: I30587abcc4062808e13570ff2a158a0fdc60cad2
| * \ Merge remote-tracking branch 'origin/5.11' into devFrederik Gladhorn2018-01-2947-96/+644
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was pushed directly, bypassing codereview.qt-project.org to get provisioning back into a working state. Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
| * | | Add a MSVC2017 platform to the default testedAllan Sandfeld Jensen2018-01-263-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Is needed for qtwebkit and qtwebengine testing and added in dev, where MSVC2013 was removed to not add additional pressure on the CI. Task-number: QTBUG-65830 Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-01-245-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I3b1e1f1b46d3cb067e335ce1bef0da3046afed8e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-0447-193/+328
|\ \ \ \ | |_|_|/ |/| | | | | | | Change-Id: I3b299786e8500b0a8f2c197f7501f8e6e1cf29cf
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-0345-188/+320
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I3e4ae2508d632919db77af0f365eb25ace1a69e0
| | * | | Provisioning: Disable Network Time ProtocolHeikki Halmet2018-02-028-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NTP need to be disabled from all tier2 templates Task-number: QTQAINFRA-1608 Change-Id: I89e019c23b7a194efffa011200a8c870e3a65d66 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | | Remove excess sourcing of try_catchTony Sarajärvi2018-02-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3bfa7e8755dbae904719212c22549f6965142330 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | | Add Win7_x64 provisioning for RTA purposesJoni Jäntti2018-02-0235-186/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows 7 x64 (Windows 7 msvc2013-x86_64) template is needed since RTA is starting to deploy machines from coin. Task-number: QTQAINFRA-1521 Task-number: QTQAINFRA-1615 Change-Id: I7e9665bd37ee010a59ff3792f435d65eb9ad8c17 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
| | * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-02-027-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I839f931dc0c3202543cfbc0137e7f54184efa037 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Instead of just warning that apt failed, tell whyFrederik Gladhorn2018-02-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the lsof we should see which process was holding the lock. After that we can disable this source of problems. Change-Id: Ie6a014bdb101e6230139569c0e4ea51a57089c30 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-02-0216-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefacfb5735b27e25a7e5eba595245f22a9ae07d1 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Provisioning: Switch download sources for mqtt paho brokerMaurice Kalinowski2018-02-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal resources are preferred and should be used first. Change-Id: Ifd2a54858c9fb6b82c3dc268566c67238aad262e Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | | Update MQTT provisioningMaurice Kalinowski2018-02-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting an environment variable has been centralized to a separate script. Change-Id: I027f9a71d32ee7f7d68575c9433f56a40a369deb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | | Provisioning: Fix location of sw_versions.txtFrederik Gladhorn2018-01-311-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | I did not see this in the previous direct push. Change-Id: I620dcc7f1c562e5bd9e09d479a4a5b8598a970fb
* | | | Merge remote-tracking branch 'origin/5.10' into 5.11Frederik Gladhorn2018-01-2946-55/+603
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/linux/qnx_700.sh coin/provisioning/common/windows/libclang.ps1 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
| * | | Merge remote-tracking branch 'origin/5.10.1' into 5.10Frederik Gladhorn2018-01-2947-51/+606
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
| | * | | Merge remote-tracking branch 'origin/5.9' into 5.10.1Frederik Gladhorn2018-01-2947-51/+606
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was pushed directly, bypassing codereview.qt-project.org to get provisioning back into a working state. Change-Id: Ia5d2e6f7079162f571cd7c7994c0f2b3133b1163 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | | * | Provisioning: Attach subscription to systemHeikki Halmet2018-01-292-1/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subscriptions need to be reattached when subscriptions have been renewed by Red Hat. Directly pushed to get provisioning into working shape. Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Change-Id: I6e469d7fac3b848193f280702e1e807ce4ea096b
| | | * | Provisioning: Add Squish provisioning for Release Test AutomationHeikki Halmet2018-01-2614-0/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squish is required by RTA for testing. Task-number: QTQAINFRA-1523 Change-Id: I0c3653565f19cc9b798a0b63325c47b017cf5537 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Matti Paaso <matti.paaso@qt.io>
| | | * | Provisioning: Add common shared folderHeikki Halmet2018-01-2610-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Common shared folder includes scripts of files which are common for all operating system families. Changes under shared folder will trigger provisioning for all platforms Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4 Task-number: QTQAINFRA-1451 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * | Add nfs-common for mounting to workTony Sarajärvi2018-01-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1690 Change-Id: I43453da3267664c664e80510e3750d1906d00078 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * | Provisioning: Use SetEnvVar helper function in scriptsJoni Jantti2018-01-2620-42/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when adding an environment variable in provisioning we have to check if the system is Ubuntu and use .profile instead of .bashrc. This check should be done in a function so we don't have to duplicate it for every provisioning script separately. Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-2613-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie34e726ef71d33bb0726a10886edd3153783376a Reviewed-by: Liang Qi <liang.qi@qt.io>
| | | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-206-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaadacb41390a5b028d99d4427895af6529b13b59 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | | Adjust submodule branchesOswald Buddenhagen2018-01-261-40/+40
| |/ / / | | | | | | | | | | | | Change-Id: If777dfa31ad635b8a2a6cb98d65c0be5f6e39a39
| * | | Update submodules on '5.10' in qt5Liang Qi2018-01-263-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7823fe54729d3b385e11b1a2f7b6f6cfec6ebe55 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-244-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I92a54351148ee369eaacca6064c12b73f18be4da Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-236-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id21e7a1007ee9ea956431fe84890337074271f7d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | Adjust submodule branchesOswald Buddenhagen2018-01-241-41/+41
| |_|/ |/| | | | | | | | Change-Id: Id6fe05f393152581b8509fd613084df1f318bc54
* | | Enable ARM64 build for QNX7Samuli Piippo2018-01-241-0/+2
| | | | | | | | | | | | | | | | | | Change-Id: Ic30f4032c73ec16a9f1b93b3afee1e9812074bb7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-01-2337-0/+0
| | | | | | | | | | | | | | | Change-Id: Id6db5f3aa546198917e3e14e53c47126c9f4a012 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Merge remote-tracking branch 'origin/5.10' into devFrederik Gladhorn2018-01-225-12/+24
|\| | | | | | | | | | | Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
| * | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-212-0/+0
| | | | | | | | | | | | | | | Change-Id: I9405e2dc8a6a93cbf5d7f86d8dbfd9a96c8b41b1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-207-0/+0
| | | | | | | | | | | | | | | Change-Id: I0a49d2eb0c8a7b7a16aa32ba24924299f6d40270 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-196-14/+25
| |\| | | | | | | | | | Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
| | * Move exception throw to the correct lineJoni Jantti2018-01-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This throw was placed on the echo line instead of the actual command. Change-Id: I907c2ce17afa64c9c4ef628d766d7dfe270ade59 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-1929-0/+0
| | | | | | | | | | | | | | | Change-Id: I48a99c5161698f833ab0f0798690e5fa963057d5 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-182-2/+6
| | |\ | | | | | | | | | | | | Change-Id: I1c5c5e6e938f33dd8b0b9c40e64d509eeec25774
| | | * Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries"v5.9.4Jani Heikkinen2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now debug symbols are added in qtlibs as well and library size is huge. We need additional 'separate_debug_info' flag in addition to this but currently there isn't support for it in coin. That's why we need to revert this change until coin has full support for this. This reverts commit b0b6b05b34f7d24c3a762e9b383c1b5bd1153a04. Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| | | * Update submodules on '5.9.4' in qt5Qt Submodule Update Bot2018-01-187-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I21728a4b47373450defe1a90bd9bcf4680f323af Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.9.4' in qt5Qt Submodule Update Bot2018-01-1410-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I103ce41b4b7c576e36b43215401e83e43a0e522e Reviewed-by: Liang Qi <liang.qi@qt.io>