aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | provisioning: windows: ICUJoni Jäntti2017-09-011-2/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed ICU script to actually install ICU instead of just setting the environment variables. It is required to build qtwebkit. Change-Id: I8881f9c11599d99b4d400595c9b929cf6f37088a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Make CI use a new provisioned Win 10 templateJoni Jäntti2017-09-0113-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 10 template. Task-number: QTQAINFRA-1263 Change-Id: Ieeb2ae3c53841644996d99ca86228df6f825a63a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-229-0/+0
| | |/ | |/| | | | | | | | | | Change-Id: If34cf07aad9b4b3a539223dd37c40c799ffb7ba3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-253-0/+0
| | | | | | | | | | | | | | | Change-Id: I5ef48890ad2a3c87c1dd89bc4ee35f132bd0d967 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-237-0/+0
| | | | | | | | | | | | | | | Change-Id: I60fda85bc418ae5d030608184edc242f82d12227 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Provisioning: Update MQTT provisioningMaurice Kalinowski2017-09-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | MQTT_TEST_BROKER_LOCATION needs to be prepended to .bashrc to avoid not being evaluated. Furthermore, a previous installation might need to be removed. Change-Id: I9edaeb13378aa262b453f816260ade01ba414961 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update submodules on '5.10' in qt5Liang Qi2017-09-225-0/+0
| | | | | | | | | | | | | | | Change-Id: If7ecb5f1d09e34878a553b287771a8eed395bfd1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-2110-0/+0
| | | | | | | | | | | | | | | Change-Id: I6fe7831d598a724eb8796e8a8e97a4946f5d6be4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-204-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic0421ee85440e9f08f805c6f475238bf8820da0f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | provisioning: Windows 10 x64/x86 Vulkan SDKJoni Jäntti2017-09-193-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | Added provisioning for LunarG Vulkan SDK on Windows 10 x86/x64. Task-number: QTQAINFRA-1186 Change-Id: Ie6a4d3a9d8b605e4f1301a3045f8165d349f216f Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵Simon Hausmann2017-09-194-4/+17
|\ \ \ | | | | | | | | | | | | refs/staging/5.10
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Simon Hausmann2017-09-184-4/+17
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh Change-Id: Icf3d05fa71052b411febe58c287b9a5b014a275f
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-1812-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I46cf8a6f861952ceed6a36ae1b2cb7ca2b103fb8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Clean up QNX patchingSimon Hausmann2017-09-162-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches from ci-files01 instead. Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | Update submodules on '5.9' in qt5Liang Qi2017-09-138-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I352ed23b7e7a025b1e1730f15a5c0ecc60497c52 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Build examples also on Linux with namespacesSimon Hausmann2017-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change we get coverage for namespace related build breakages in examples of Linux-only modules, such as wayland. Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| | * | Install python3 on all platformsDominik Holland2017-09-124-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This forward-ports commit a99d3432f71c4be5045ae2cdcc3b7070de5abe23 to 5.9, which should have been done in 6bf5691ca87dd4dcf9386a4c6320be2c39db6dcb but accidentally left out. It reuses parts of commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74 that was initially cherry-picked to 5.6. Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Update submodules on '5.9' in qt5Liang Qi2017-09-1117-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I9897024607ffd0e320ad56fa8ab1d9d4ceacc6c2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-193-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic5c4e7dde129798e0799d74741c69b32c855351f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-182-0/+0
|/ / / | | | | | | | | | | | | Change-Id: I08e75951d175003a670987e1f9ea35296bc12d16 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-176-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia67db183b40e1bec41677876f7c8c4c4e69f30d9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Fix python installation on OpenSuSE 42.3Simon Hausmann2017-09-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The move was forgotten in commit dd3d32d13cf03a9e6ca661408b7995e8493c6af4 that merged the 42.1 to 42.3 switch from the 5.9 branch. Change-Id: If76ac7b54187cfb29dafeaccbd3cd56e3e01deab Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | | Add mqtt to qtci-linux-openSUSE-42.3-x86_64Maurice Kalinowski2017-09-141-0/+0
| | | | | | | | | | | | | | | | | | | | | MQTT provisioning happened concurrently with an OpenSUSE update. Change-Id: I23a8b632ff82e3900931b58d3d06b9f37bda5998 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-138-0/+0
| | | | | | | | | | | | | | | Change-Id: I155cd4eccb5b298f93fe36437b9db450d6e23a6d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵v5.10.0-alpha1Jani Heikkinen2017-09-1021-135/+221
|\ \ \ | | | | | | | | | | | | refs/staging/5.10
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Simon Hausmann2017-09-0621-135/+221
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qtdeclarative.txt coin/provisioning/common/InstallPKGFromURL.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
| | * | Provision openSUSE 42.3 and add to CITony Sarajärvi2017-09-066-1/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaces 42.1 that isn't supported anymore by openSUSE.org. Task-number: QTQAINFRA-1257 Task-number: QTQAINFRA-1259 Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-0612-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I96537e757b58500804180cb579d4777e6abbfc96 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Use 64-bit host for VS2017 builds of QtWebKitKonstantin Tokarev2017-09-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| | * | Provisioning: Fix helper function's mktemp in macOS 10.10Simo Fält2017-09-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that macOS 10.10 has a non standard mktemp command. It doesn't work as expected but prints usage and exit instead. Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-0223-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8d2a3b3c53ef50f543e69d8824e2ec95939956aa Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Prefer apt-get over apt in scriptsFrederik Gladhorn2017-09-021-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apt explicitly warns that it doesn't have a stable UI, so it shouldn't be used in scripts. This should have no implications in practice. Change-Id: Id0bb0d44e73b80a19f6ba4ca1aa4d92c09d10a92 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * | Provisioning: Add variables properly in .bashrcTony Sarajärvi2017-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Ie2c64764f9e0a676307cb3a144162cbc35eb33fb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Swap B2Qt branch to MortyTony Sarajärvi2017-09-022-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1364 Change-Id: I9b114d2cbea60928fac4aa8dec9721099b92f5f6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * | Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-08-3126-216/+331
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/InstallPKGFromURL.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
| | | * Install python3 on all platformsSimo Fält2017-08-3018-1/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python3 is required in 5.6 by pyside-setup. Task-number: QTAUTO-345 Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74) (cherry picked from commit a7658388892bc70c3c5f3a6f6e31639ef5b766d1) (cherry picked from commit 1859f9b26ce0177cb83e917148b10ff08bb25db7)
| | | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-305-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If6a7d9a6d34a5e25459c1c3bca1ef55f923eeeae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * Fix code duplication for cmake installation on LinuxSimon Hausmann2017-08-303-106/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Share the code for installing cmake on Linux. Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | | * Fix adding to path lines for Windows provisioning scriptsJoni Jäntti2017-08-302-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the path addition command will forget the previous addition when adding a new string. This hasn't been found out because python was the only script using this command. Now we also need to set the path for ruby, so the python string is left out. Change-Id: I39721d78111550189e52a9f095030033f9660c0a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
| | | * Provisioning: Fine tune cmake provisioning scriptTony Sarajärvi2017-08-301-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add version printing and move version strings to variables for easier reuse. Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | | * Provisioning: Add $PATH properly in .bashrcTony Sarajärvi2017-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-294-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I89cafd064580d98afb8c55c82465bc3348652ff3 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Fix cmake and python installation on RHEL 7.2 and OpenSuSE 42.1Simon Hausmann2017-08-293-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge commit 74eb853384473dbe18123f9731b6f9529d68d2cf accidentally brought forward the removal of files from commit 49ccf716dca2a14d21ce6869cdcd64b861c53834 that were not supposed to propagate. Change-Id: Ia5d6b2205c75f0856c3fed104149980c75a55840 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-283-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I96b67c72364dabaf6bbefbcf561104bbd01ee6b3 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-283-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf7a0094c2e06fdf7b1f62eaf90d6e4f6c6e1161 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Fix target architecture for Boot2Qt declarative testsSimon Hausmann2017-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 7456e028a701ff31f63a465fb8fadca63c453b97 and therefore allows the re-use of the boot2qt build artifacts. Change-Id: I4b01bf13e0004c4c3c3a2be00b02760e0ad3ffdd Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-258-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia93843e106a111a79740fe9b5a55eb177259dcfe Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Provisioning: Install paho mqtt brokerMaurice Kalinowski2017-09-1014-0/+323
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The paho broker is used for testing the Qt Mqtt module, specifically the client classes. Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-09-1017-0/+0
|/ / / | | | | | | | | | | | | Change-Id: Ic0236346284e3b30012977f634f52d8aa3851d24 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | | Swap B2Qt branch to PyroTony Sarajärvi2017-09-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1364 Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 21:22:38 +0000