summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make Qt3D depend on qtbase and optionally on qtdeclarativewip/tqtc-qt3dstudio/mfc2qtwip/tqtc-qt3dstudio/masterHarald Vistnes2017-08-021-2/+2
| | | | | | | | | | This change will make the pure C++ libs of Qt3D be built even if qtdeclarative is skipped. Task-number: QTBUG-62256 Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Update Xcode to 8.3.3 in macOS 10.12Tony Sarajärvi2017-07-311-1/+1
| | | | | | Change-Id: I990d2ac89044a5afc6170da9f5c22bc144021036 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Replace QNX7 target with QNX6.6 for all Qt modulesPaolo Angelelli2017-07-262-2/+2
| | | | | | | | | | Reason being that it's much easier to trigger compile errors with the QNX6.6 toolchain than with the newer QNX7, so these show up at once and not only at qt5.git integration. Task-number: QTBUG-62047 Change-Id: Ib45728c92488206dbede019e4583bc9a5386b90f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-07-197-11/+68
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt This also reverts c9d5341307e02cc71d4d99342e6915621f7d18f3 as on macOS 10.11 in 5.9 we're using a fresh virtual machine template that doesn't have stale virtualenv/python installations. Change-Id: Iab50fde0388c97967ada7c40374345ce4327613a
| * Provisioning: Fix virtualenv in macOS 10.11Simo Fält2017-07-191-0/+17
| | | | | | | | | | | | | | | | | | | | There are multiple Python installations in our macOS 10.11 Tier1 template. Most of them are pretty old and not even working properly. One of the affected Python tool is virtualenv, which atm is creating Python 2.6 env by default even if Python 2.7 is the default Python. Change-Id: I8bc0900976a9dc79637539802345175c85b7b433 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Use updated Ubuntu 14.04 in CIJędrzej Nowacki2017-07-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: I34d7a56a2c5530376f74bb35faf461e2e18da14a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-123-0/+0
| | | | | | | | | | Change-Id: Id5ae5de68635938bc402242a3d98cb3765154d43 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-062-0/+0
| | | | | | | | | | Change-Id: I8701d1b838be1730ccaaa2835c47e0389bb4bcc3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-041-0/+0
| | | | | | | | | | Change-Id: I5f1e4425bf98dd9fba31f21392dfec9d991ebf7d Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-303-0/+0
| | | | | | | | | | Change-Id: I077670116fb8fa2fdce44a0260aacfedf16234c6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-264-0/+0
| | | | | | | | | | Change-Id: I0c2e8c0756239c679a2442c164c1eafa5b21f84e Reviewed-by: Liang Qi <liang.qi@qt.io>
| * Centralize Mesa LLVMPipe installation on WindowsSimon Hausmann2017-06-207-11/+68
| | | | | | | | | | | | | | | | | | | | | | Install the DLL for general availability on all Windows systems. Due to its distinct name it will not be picked up by anyone unless Qt explicitly selects it. This gives us the ability to choose the GLES backend to use in Qt. Change-Id: Ie36f202ead7080a8f7690734d305bd27f0c9f56b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-176-0/+0
| | | | | | | | | | Change-Id: I6c6a2f3d51f4899809810123112081a47f054358 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Use updated Ubuntu 16.04 in CIJędrzej Nowacki2017-07-182-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | The system packages in the base template were updated via apt-get on 12.07.2017. We hoped that it will solve mysterious problem of a network interface being randomly disabled. Sadly we had no luck, but getting all security updates also make sense. Change-Id: Id11eead39cf1c8a04c054c19b323f752e797fd12 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | MSVC: Run tests with MSVC2017 instead of MSVC2013Friedemann Kleint2017-07-112-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | It appears tests compiled with MSVC2013/64bit are prone to crashes. Keep only a developer build/compile test in default.txt and move the packacking builds to qt5.txt with tests disabled. Enable testing with MSVC2017 builds in qt5.txt. Task-number: QTBUG-58654 Task-number: QTBUG-50835 Change-Id: I6061fe3a585c4bb94100d73d04434aca42c82608 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-07-114-0/+0
| | | | | | | | | | Change-Id: I113ebb2db59a55786929361437a17536a0131676 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-07-1010-0/+0
| | | | | | | | | | Change-Id: I3ab9f3aa74c97094076a9c385a152d1af7b6a876 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | 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.15.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>
View Lorry Controller Status