aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| | | * Provisioning: Set CMake to PATH on UbuntuTony Sarajärvi2018-01-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ubuntu uses .profile file instead of .bashrc. We need to use the correct file accordingly. Task-number: QTBUG-65594 (cherry picked from commit 22e4664eb08dc5384c5afd0bd6c6a0725b242517) Change-Id: Iceeec53882f1a5c97cd8f7ea5b013d543c156acb Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | | * Update submodules on '5.9.4' in qt5Qt Submodule Update Bot2018-01-0920-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d1b498fc931464636734fc30b7852645383fc9c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | * Update submodules on '5.9.4' in qt5Qt Submodule Update Bot2018-01-0517-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id238fb2be13cf7782a225e43e1d31ab195f56007 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Provisioning: Fix disabling windows updatesOliver Wolff2018-01-181-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some machines the updates were already disabled, which lead to the call to disable the service failing. Now we just move on without error. Change-Id: Ia48f7164c23dfe24e24548558d582cdc0190b7e3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Fix provisioning: NotePad++ path on 64 bit windowsFrederik Gladhorn2018-01-181-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We install the 64 bit version of np++ which is installed in the regular program files folder. Change-Id: I702210eaf7dfae75bbfcfd9cc98d8ed96d775f61 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * | Fix provisioning: Wait for msvc-2013 update 5 to finishFrederik Gladhorn2018-01-181-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installing Update 5 for Visual Studio 2013 Update 5 (KB2829760)... Removing C:\Windows\Temp\vs12-kb2829760.exe ... Caught System.UnauthorizedAccessException Access to the path 'C:\Windows\Temp\vs12-kb2829760.exe' is denied. Change-Id: I9fe136f0361ee21e38563dd17bf76bf4fd53747f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Fix checksum for QNX 7 SDK downloadFrederik Gladhorn2018-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia37c6d032d1a4c2841482292a2c2c2f8fd468859 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-179-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0e7cb3a46909c3b72e2639b9ef2214428bd02cb6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2018-01-137-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I968ccd381929d89ef988d3ac2f468b25cbeb8365 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-1931-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I7b7796d1651b5b1384f543b9e64c0c836113689c Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-185-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibbbd5202c450921ba47c33e28034fce631e82546 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-175-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I986f33a9a04f1172c5fbfe37a45f984837a2a684 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2018-01-1619-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I43c91914547bb1b27f29ce948707eaf4b8373825 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-121-1/+1
| |\| | | | | | | | | | | | | | Change-Id: Idf9c18da5527327178887c257fc56dbc27e1c8ad
* | | | Add dependencies needed to build YoctoTony Sarajärvi2018-01-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1690 Change-Id: I9583c39709849d058e6d44473e074e9327907dd8 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2018-01-194-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I6a9db841c7c6c9eba6248072caa8069dacb853da Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Add nfs-common for mounting to workTony Sarajärvi2018-01-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1690 Change-Id: I43453da3267664c664e80510e3750d1906d00078 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | | | Consolidate provisioning script name for qnx in macOSTony Sarajärvi2018-01-181-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Id07686bcc677b62a4981a46cabefd40b544815c5 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | | | Update submodules on 'dev' in qt5Liang Qi2018-01-1819-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I30571e17dc4fafbaf66232546bf33ba4965d36e8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Use "correct" registry when enabling Windows 10 Developer ModeOliver Wolff2018-01-171-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As coin is running a 32 bit application the registry key ended up in the Wow6432Node compatibility area of the registry when run on a 64 bit Windows. Windows does not use this place to check for the developer mode setting, so we use the "proper" registry instead. If adding the registry key fails the script now reflects that and exits with a proper exit code. Change-Id: Ifd6bc7e7b0ed6595a2a967597ab45053cb51e7aa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | Move QNX 7 arm build from qt5 to defaultLiang Qi2018-01-142-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNX 6.6 builds were removed. We need to check QNX in submodules build. This change amends 357de3ea1343d8bfbc2ec71d743e5981c396ca4f. Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | | Fix common folder paths for common split changeHeikki Halmet2018-01-139-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2018-01-121-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I9a419b82cc05549f6d8e6394bec5c349aa1c9c63
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 13:46:51 +0000