summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Update qtwebengine and qt3d onlyLiang Qi2017-07-182-0/+0
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-61693 Task-number: QTBUG-61983 Change-Id: I703ea440ae1b572ae97c4c6616f63b5524718931 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-14111-831/+2227
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qt5.txt Remove QNX Windows builds, 0358b6d2 Remove Integrity build temporarily, QTBUG-61702 coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Done-with: Liang Qi <liang.qi@qt.io> Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
| * | Add Packaging configs for VS2017 and MinGW to stand-alone QtWebKit buildsKonstantin Tokarev2017-07-091-0/+5
| | | | | | | | | | | | | | | Change-Id: I6a51f733d310d8542b184e813f49f1500666d6ee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Conan: update ICU to 59.1, added VS2017 packagesKonstantin Tokarev2017-07-0921-381/+982
| | | | | | | | | | | | | | | | | | | | | | | | MinGW packages will be upgraded in another patch. Task-number: QTBUG-61728 Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 hostKonstantin Tokarev2017-07-092-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Also upgrade to Conan 0.24.0. Task-number: QTBUG-61829 Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provisioning: move Conan manifests to common directoryKonstantin Tokarev2017-07-0921-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We need to use x86 packages from qtci-windows-10-x86_64 configuration, so splitting Conan manifests by configuration is not a good idea anymore. Task-number: QTBUG-61829 Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provision homebrewSimo Fält2017-07-082-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the macOS templates are cleaner than others and are mising some basic tools like 7z. Homebrew provides easy way to install wide range of tools via command line. Change-Id: I5a8528bb4a13ef9a72e2467c51a8b5d45f9a3d84 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provision libclangSimo Fält2017-07-0813-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | PySide versions following 5.6 use a C++ parser based on Clang. The Clang library (C-bindings), version 3.9 or higher is required for building. Change-Id: Ia7bcad46e3214d6d8b688354c9abdc83a513573c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provision 7zSimo Fält2017-07-081-0/+4
| | | | | | | | | | | | | | | | | | | | | macOS 10.11 tier1 template is missing 7z. Change-Id: I9e1ade8605b5e6f389a2cd76340070070a7c637b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-07-086-0/+0
| | | | | | | | | | | | | | | Change-Id: I15484289efb35a8b8763379466c884f32f2f9cf9 Reviewed-by: Simo Fält <simo.falt@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-07-0611-0/+0
| | | | | | | | | | | | | | | Change-Id: I611bb70dfb5a51adfce657491820735f13aec274 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-07-040-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I45fa799354b107ba95b55063f6b81f4dca4b8bb5
| | * | Update submodules on '5.9.1' in qt5v5.9.1Qt Submodule Update Bot2017-06-281-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I4d1313a38b7f2296db43badf8e8906be9fa6b3d3 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.9.1' in qt5Qt Submodule Update Bot2017-06-2439-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iab5c3a27dbaab7804978afb0bde341155903c141 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * | Fix builds with examples and namespaces and tests in qtbaseSimon Hausmann2017-06-232-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually bump declarative include a sha1 that'll unbreak the build. Also bump qtbase to latest 5.9.1 to include the blacklisting of tst_qudpsocket::linkLocalIPv6. Change-Id: If5739bc170bc7f2e45d8c5e785bcad6eb15fddcd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Merge remote-tracking branch 'origin/5.9' into 5.9.1Oswald Buddenhagen2017-06-1925-179/+123
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I4cd60a86dc6538d94163702e9635a58157c599b6
| | * | | Adjust submodule branchesOswald Buddenhagen2017-06-121-41/+41
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib2a7d9a96a8c992527db170276cd0e34b85d1dc2
| * | | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-07-0441-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I599d90ba87636b0e738d2263ddfd036f458ae8fe Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Provisioning: Install Ninja on windows hosts used to build cmake-based QtWebKitKonstantin Tokarev2017-07-034-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile-based generators of CMake are much less efficient than Ninja. They generate bloated Makefiles that call back to cmake often. Main offender on Windows is cmake_depends command which seems to do lots of disk reads. QtWebKit can now switch to ninja automatically if it's present in PATH. This should help to reduce build times. Change-Id: I33d3f4d766a630f8ca4fb64b719fe2e8a5c2e00c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-06-2910-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia1e8d5681b65e37882b61f1a00f9f6acc88f81b9 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-06-2513-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic665ad45eee9ee847438921bc663e9374c94a59b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | | Update submodules on '5.9' in qt5Liang Qi2017-06-2418-0/+0
| | |/ / | |/| | | | | | | | | | | | | | Change-Id: I228229c5b9afaa6e3a34ba33d7b3cbcc17695629 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-06-1810-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Idfe407e44ed4a659615a711c34570cd99096a502 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Update submodules on '5.9' in qt5Liang Qi2017-06-1714-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If5a5489690a896422cdc183b520635675d76118b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Remove provisioning scripts for platforms not supported anymoreTony Sarajärvi2017-06-145-94/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I8c3685aaf51005f58ba84f695879f82e32a4f689 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-06-1413-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibea2cde30fc92cc089622379068af09e453d8504 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Enable autotest for macOS 10.12Tony Sarajärvi2017-06-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1093 Change-Id: I21e715b10593d0a9c55b2324c6af8e4bffca0b72 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | | Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-06-1221-112/+149
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
| | * | Fix Postgresql and Mysql environment variablesSimon Hausmann2017-06-122-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct paths to the headers are c:\utils\postgresql[x86]\pgsql\include not c:\utils\postgresql[x86]\pgsql\pgsql\include Same for libs. Regression introduced by commit ce47238ed94f3a989c13fef93b037904589910cf but only noticed in the 5.9 branch. Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * | Remove QNX Windows buildsSimon Hausmann2017-06-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can't get those to work with the faster KVM based VMs, so disable these builds for the time being. Task-number: QTQAINFRA-1208 Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Disable tests on macOS 10.10Simon Hausmann2017-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot run graphical tests reliably on 10.10 anymore with the new virtualization without vmware. As outlined in the referenced task, we occasionally get the Window Server locking up. So for the time being, this change disables testing on 10.10. Task-number: QTQAINFRA-1198 Change-Id: I020d4a298562554838cd7e898df52438db536d7a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * | Clean up windows cleanup scriptSimon Hausmann2017-06-066-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * There's no need to have a numbered prefix in the common directory * Instead of deleting directories trees worth several gigabytes of data, just rename the directory. The underlying storage system is copy-on-write and so deleting the files produces more data than just moving the directory out of the way. Deleting the files does not actually free up any physical disk space. Change-Id: I6de02d56f3485651726ea11183ce7571d5b61520 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Speed up Windows installation of cmake, python, opengl, mysys and AndroidSimon Hausmann2017-06-067-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're better off copying off the internal server using CIFS than using PowerShell's incredibly slow Invoke-WebRequest. Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| | * | Speed up Visual Studio update installationSimon Hausmann2017-06-063-34/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have a prepared package on the internal server that has everything necessary included. This way we do not have to download the actual update content from the internet. Change-Id: Ie4cb3116a4f91a47df5be1c2b2e473d7ddec9a78 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
| | * | Improve Postgresql installation on WindowsSimon Hausmann2017-06-063-23/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to the mysql change (parent commit) it's faster to rename any older artifacts and install only what we need. This also generalizes the zip archive extraction code for "dev" packages. Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * | Improve mysql installationSimon Hausmann2017-06-061-44/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Instead of deleting the files from a previous installation, which will not actually release any disk space but just make the qcow2 file larger, let's just rename the directory the old files are in. That is a significantly faster operation. * When extracting the zip archive, only extract what we need for Qt: Libraries, binaries and headers. We can skip the installation of several thousand documentation files for example, which takes a long time. * Instead of downloading the zip archive via PowerShell's Invoke-WebRequest we can get the data much faster using CopyItem off the CIFS share. As a bonus this is also more robust against download failures. Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-035-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-05-297-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Build examples with MSVC 2015 instead of MSVC 2013Kai Koehne2017-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt WebEngine does not build with MSVC 2013 anymore, hence the examples from this module weren't tested at all. The 2015 configuration also places the Qt symbols in a namespace, so this adds additional coverage. Change-Id: I395866e8435fbcba33a1b3b4a4a5ccfe82ebad15 Task-number: QTQAINFRA-1271 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Enforce MinGW developer buildFriedemann Kleint2017-06-122-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MinGW is very sensitive to inlining / export errors, so having a developer build check is valuable. Add a MinGW developer build executing tests to increase coverage and turn off testing for the packaging build in return. Change-Id: Ia4bdacc9952c7a568ac9d4105818eb926c88e6ca Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-06-1210-0/+0
| | |/ | |/| | | | | | | | | | Change-Id: I2cfafe4529e2eb9f3c18bdc79365f0f306d42891 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Enable CI tests for Boot2QtSami Nurmenniemi2017-06-091-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-60261 Change-Id: I296cf7f9afc15aebf1d2006c51023cb6ac3b0c3b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.9' in qt5Liang Qi2017-06-0734-0/+0
| | | | | | | | | | | | | | | Change-Id: Ie82dec6200b3b2a9633feb2dabec9ac27afbcaf8 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Provision macOS disable screensaver in current sessionTony Sarajärvi2017-06-052-0/+8
| | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1244 Change-Id: I3a27d8cdee8cd7b22d86116d58009e952ab536ea Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Add missing ForceDebugInfo -flag for winRT x86_64 buildsJani Heikkinen2017-06-041-2/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1233 Change-Id: I5fadf9a71e5835b852849fbee1f7021864044f25 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Build Windows 10 MSVC2015 x86 on Windows 10 x64 hostAkseli Salovaara2017-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changing MSVC 2015 integration host from 32 bit to 64 bit machine enables CI for QtWebEngine 32 bit Windows builds. Change-Id: I3d30df90fa7d92c603a2e91dd528d817e682c214 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | qtremoteobjects has QML pluginsThiago Macieira2017-06-041-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ia3e896da908f42939148fffd14c47ef303f5d0e7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
| * | Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-268-15/+104
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
| | * | Update submodules on '5.9.0' in qt5v5.9.0-rc1Qt Submodule Update Bot2017-05-223-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I4b682b41b9d42a95c9d7837a0c9d2a5cd1b16d0a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * | Update submodules on '5.9.0' in qt5Qt Submodule Update Bot2017-05-207-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I59a75557095d67dad5cf36f78fb86eb17cd05513 Reviewed-by: Liang Qi <liang.qi@qt.io>