aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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>
* | | Adjust submodule branchesOswald Buddenhagen2017-06-121-41/+41
|/ / | | | | | | Change-Id: Ib2a7d9a96a8c992527db170276cd0e34b85d1dc2
* | 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>
| * | Update qtlocation manuallyLiang Qi2017-05-191-0/+0
| | | | | | | | | | | | | | | Change-Id: Ief99f6b991ea0fbfc2c0d019b68835db36539587 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.9.0' in qt5Qt Submodule Update Bot2017-05-1930-0/+0
| | | | | | | | | | | | | | | Change-Id: Ifc375a6978c7d8fc89396b7bfbebb18f90d59b37 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Enable WinRT builds for MSVC 2017v5.9.0-beta4Heikki Halmet2017-05-111-0/+3
| | | | | | | | | | | | | | | | | | | | | All 2017 configurations are added to qt5.txt for now. Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Merge remote-tracking branch 'origin/5.6' into 5.9.0Liang Qi2017-05-088-15/+101
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Id82a13a6b2fe6db60c286e470396298c08e363b8
| | * MSVC 2017 updated and missing component for winrt armHeikki Halmet2017-05-036-7/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSVC 2017 and Build Tools updated to version 15.1. Also missing component 'Visual C++ compilers and libraries for ARM' installed for winrt arm Also script added to storage msvc version numbers to versions.txt Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * get rid of custom 'qt' gitmodules propertyOswald Buddenhagen2017-04-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-272-0/+0
| | | | | | | | | | | | | | | Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.9.0' in qt5Qt Submodule Update Bot2017-05-077-0/+0
| | | | | | | | | | | | | | | Change-Id: I4d592c4749ad4ddd8a54ce186ae89682a564a5ba Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.9.0' in qt5Qt Submodule Update Bot2017-05-0633-0/+0
| | | | | | | | | | | | | | | Change-Id: I3d17d880ce8a5ef4180cdbfb163df8d4f07a0398 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-0519-144/+324
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules Change-Id: I5b4d96eedbbc228d61d7c62ff077c05a4fb70928
| * | | Adjust submodule branchesOswald Buddenhagen2017-04-271-41/+41
| | | | | | | | | | | | | | | | Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951
* | | | Add *.pro.user* to .gitignoreJason Erb2017-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-60767 Change-Id: Id81504b35dc8d3ef7eba6ada5baaefe5e6d9f106 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
* | | | make -skip work with configure -redoOswald Buddenhagen2017-05-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the handling of -skip happens outside the usual argument handling, so we need to handle -redo manually as well. Change-Id: I7dcdf729bd9db2ff2ac8dc08bac71462bf30814b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-05-2516-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2fd0c63e8b891b8595104f9f2745d62e520f340a Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on '5.9' in qt5Liang Qi2017-05-2341-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I3cfe11ad0b5065f90cf57a98218af308a8906bba Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-05-0726-0/+0
| |/ / |/| | | | | | | | | | | Change-Id: Ieb47df20d8495f0dd6f726645330dcb9542cf96d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Change OS X 10.11 to run tests instead of 10.10Tony Sarajärvi2017-05-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit removes OS X 10.10 as a developer build target, and enables autotests on osx 10.11 developer build. Task-number: QTQAINFRA-1090 Change-Id: I0ba0a60edd7010eedd3289c400266b4cced6c133 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 20:59:16 +0000