aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-2210-38/+30
|\ | | | | | | | | | | | | Conflicts: coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
| * Fix Android provisioning scriptSimo Fält2017-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | We have to accept extra license to enable installing all required packages. Task-number: QTQAINFRA-1660 Change-Id: I9d014991be96ff0723688b317a645e281b3e92d0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 5df4ec2ec999440ba291f2bf2f9fa6b72810660d)
| * Remove unneeded OS X provisioning scriptsTony Sarajärvi2017-12-225-15/+0
| | | | | | | | | | | | Change-Id: Icf03c93adee31baac383d1394857df8c2df4fe59 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * Remove 'Packaging' flag from builds we don't need itJani Heikkinen2017-12-222-3/+3
| | | | | | | | | | | | | | | | | | We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit so we don't need 'packaging' flag there either Task-number: QTBUG-65324 Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-2213-0/+0
| | | | | | | | | | Change-Id: Ice93ecfe5e5c093c7bf455c05b87383cf157ed2e Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Simplify apt package installation and disable daily package maintenanceSimon Hausmann2017-12-201-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using aptdcon, we can continue to use apt-get to install the software. We just need to make sure that the automatic update and package upgrade services are disabled. This is generally desirable as we do not want these kind of activities to occur in the background while building or running tests. This also fixes the broken package installation via regex, which apt-get supports but aptdcon does not. Revert "Fix Ubuntu 16.04 random provisioning fail" This reverts commit 537ea17d14526bc6564765e2dd4652e11a3ed235. Conflicts: coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh Change-Id: I920e5132bb0a248d3794e1efcf01ce78d28e6ee3 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-206-0/+0
| | | | | | | | | | Change-Id: I85ef0fa0ae59f600ab53e9b566a08b2f22184f33 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Install cups-devel in OpenSuseAlbert Astals Cid2017-12-181-0/+3
| | | | | | | | | | | | | | This way we have one build that compiles the "with cups" branch and others (the ubuntu ones) that compile the "without cups" code branch Change-Id: I45ab3d72c34367789e0f344c917a88269883cffe Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-189-0/+0
| | | | | | | | | | Change-Id: Ibdf2e0ca968b4fa5c0a5be8c6bfc1d05aa90d17d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-204-0/+0
| | | | | | | | | | Change-Id: I84aaff41d77d31eb5c4c9aae973aaccd879ede3e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Add libxml2 and libxslt to RHEL 7 for QtWebKitKonstantin Tokarev2017-12-191-0/+3
| | | | | | | | | | Change-Id: I5c50ee482aa20f0d9959915c81d2c44cccce6dca Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-196-0/+0
| | | | | | | | | | Change-Id: I7d7808d588470cbb2712cbda34a0c1bcc5730d11 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Add GStreamer libraries to openSUSE for QtWebKit and QtMultimediaKonstantin Tokarev2017-12-181-0/+4
| | | | | | | | | | Change-Id: Ia40bb35687bbe1ecb429c042d4acfa22599b69b8 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-1614-0/+0
| | | | | | | | | | Change-Id: I8514e3e83b62ae4ddc527eb73bcfdcd138ac1875 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* | Remove Windows 8 provisioning scriptsTony Sarajärvi2017-12-152-2/+0
| | | | | | | | | | | | | | They are replaced by 8.1 scripts. Change-Id: Ib04c183b75cec2c6e529945f382c53fdeb23f213 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Add libxml2 and libxslt to openSUSE for QtWebKitKonstantin Tokarev2017-12-151-0/+4
| | | | | | | | | | Change-Id: Iafb89bf9c12cf1d38c2fe1944d55965319b85ea3 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* | Provisioning: Update default compiler to GCC-7 in openSUSE 42.3Tony Sarajärvi2017-12-141-3/+6
| | | | | | | | | | | | Task-number: QTQAINFRA-1258 Change-Id: Ia2683a23ecc55aae4e82f901f446d1cf46895269 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Swap ICC builds to use system's SQLite libraryTony Sarajärvi2017-12-142-1/+2
| | | | | | | | | | | | Task-number: QTBUG-64650 Change-Id: I2c692ae04f0cc02a5fecb12e3a7b905ee89b1af9 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-1411-0/+0
| | | | | | | | | | Change-Id: I6c96508c89b6acab297d4f486b3b8966e28e4eee Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-1310-141/+8
|\| | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
| * Provisioning: Remove Android script from Red Hat 6.6Heikki Halmet2017-12-131-120/+0
| | | | | | | | | | | | | | Android linux builds are run by Red Hat 7.4 Change-Id: I8661b90494c1d43cc87e50136ed185fac93e4916 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Add 'ForceDebugInfo' -flag to linux desktop binariesJani Heikkinen2017-12-131-1/+1
| | | | | | | | | | | | | | | | Add 'ForceDebugInfo' for RHEL 7.4 as well Task-number: QTBUG-3934 Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| * Fix broken and duplicate Ruby provisioningJoni Jantti2017-12-138-20/+7
| | | | | | | | | | | | | | | | | | Ruby is being installed twice on certain Windows platforms and the 32 bit versions of these don't have a working PATH addition. Task-number: QTQAINFRA-1632 Change-Id: Id7fd269854d17c32df7d0b82ac9e750e645af564 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-1339-0/+0
| | | | | | | | | | Change-Id: I0a5c2de981acb71511041c19f5ff966b87932367 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Provisioning: Install Devtoolset-4 to Rhel 7.4Heikki Halmet2017-12-132-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used instead of Devtoolset-6. Task-number: QTBUG-64820 Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> (cherry picked from commit adcdf7b49f52e745009ff7e37e07c2d831ad82dc) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-12-112-0/+66
| |\ | | | | | | | | | Change-Id: I01a6ee1ecfaabe56e585194ccfab3b25fbd89e8b
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-111-2/+2
|\| | | | | | | | | | | Change-Id: Ica3e7340f572140020318c6e22397fad393f9b15
| * | Fix syntax error - not use comma in platform_configsLiang Qi2017-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ammends d9f2fe1b7f9b90815b4056c89ec2f670ff12180f Task-number: QTQAINFRA-1636 Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-12-116-0/+0
| | | | | | | | | | | | | | | Change-Id: Ib3d4ff60bd232362ca0cf1ad455f09c83643387d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Add NSS to RHEL 7.4Allan Sandfeld Jensen2017-12-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Needed by QtWebEngine Change-Id: I66a737457cb9dd5f2cc53d64f639037926a560ca Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry-picked from 9a9d798ce44ae6a77d408e44dd61fa5a5e07b99f) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-12-0914-78/+113
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/qt5.txt coin/provisioning/common/install-commandlinetools.sh coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
| * | Add missing name prefixes for Win7 provision scriptsJoni Jantti2017-12-093-0/+3
| | | | | | | | | | | | | | | | | | | | | The prefix numbers were missing for Ruby and QNX patch scripts. Change-Id: I687b244c4657e17c32f0cc8221d3fb0ad3c5578d Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Remove provisioning scripts from non existing platformTony Sarajärvi2017-12-092-2/+0
| | | | | | | | | | | | | | | | | | Change-Id: I01ecb0a9d4050b88fc5010f5a31baa6e776c1848 Reviewed-by: Joni Jäntti <joni.jantti@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | RHEL7.4: install packages in one yum instanceJoni Jäntti2017-12-091-52/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we are opening and closing a yum instance for every package we install during provisioning. This is a bit inefficient so it's better to install them in one go. Task-number: QTQAINFRA-1586 Change-Id: Idbf814f9023da0fe8213b2ed84cd1a27a149fc27 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Fix mesa_llvmpipe provisioning script for x64 WindowsJoni Jäntti2017-12-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This script doesn't extract the dll to System32 on a x64 system. Calling "sysnative" doesn't seem to work with the custom function being used. Change-Id: Iea734a400d8c095ea2e3fe54f38e4756fba406f9 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Provisioning: Install signing tools to WindowsHeikki Halmet2017-12-091-0/+44
| | | | | | | | | | | | | | | | | | | | | Signing tools are needed when signing offline installers Change-Id: I98f12e3fdf01d273dff5fda0c2e34707174c6eae Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Move INTEGRITY build from qt5 to defaultLiang Qi2017-12-082-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Many failures in qtbase on INTEGRITY happened recently. Change-Id: Ic55259e694961a53199d30f095159728207f8824 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Add b2qt developer build for qtbaseLiang Qi2017-12-081-0/+4
| | | | | | | | | | | | | | | | | | | | | Because we had enabled this for qtdeclarative before. Change-Id: I1efd438ebf51b2e632d3f8f39bd707e7eb5a282e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Update ICC compiler from 2018 to 2018 update 1Tony Sarajärvi2017-12-081-4/+4
| | | | | | | | | | | | | | | | | | Change-Id: I2e44c98114afe559e4490d9b9ec3e1d19d7f4696 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Install command line tools for osx 10.11 and macOS 10.12Heikki Halmet2017-12-083-0/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Command line tools is needed by homebrew when installing p7zip Task-number: QTBUG-64729 Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit beb73056c30445c5236c7bbb12248bfa0939cb4a) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Update submodules on '5.9' in qt5Liang Qi2017-12-057-0/+0
| | | | | | | | | | | | | | | Change-Id: I5f68733c3c00ae4c2d1d23898552c1d2f91dee14 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-11-306-0/+0
| | | | | | | | | | | | | | | Change-Id: I133cfe933eb47073931c183fa56c540c06471ad6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-11-3035-0/+0
| | | | | | | | | | | | | | | Change-Id: I9938183f8c87a6bd34989c37045b5df8803b15d0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Provisioning: Install bluez-libs-develHeikki Halmet2017-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | bluez-libs-devel is needed to enable Qt Bluetooth Task-number: QTBUG-64782 Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Fix indentation in platform configurationsTony Sarajärvi2017-11-302-14/+14
| | | | | | | | | | | | | | | Change-Id: Id4a7bec02b0ee1156e80667538a29ca2baf4cfed Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | Add missing shbang to cmake provisioning scriptEdward Welbourne2017-11-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | It was given execute permissions when renamed recently; but the bash-isms in it will only work with that if it uses bash. Change-Id: I61468257210ba586fdaf1e79531bae0492f9e8ae Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-11-217-0/+0
| | | | | | | | | | | | | | | Change-Id: I60dd3f3e809e3c82bc3216948e8a487c77ebb890 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-11-1714-0/+0
| | | | | | | | | | | | | | | Change-Id: I1784fb95e461ceba61f8a91a410407f43116631b Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.10' in qt5Qt Submodule Update Bot2017-12-0936-0/+0
| | | | | | | | | | | | | | | | | | Change-Id: I428bbebe2b5e86e6ed7150080ab3ced2a6077fb8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-049-7/+215
|\ \ \ | | | | | | | | | | | | Change-Id: I8d8c6b21a68caf28913934141f6b1f98be0ff369