aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on 'dev' in qt5Liang Qi2017-06-2922-0/+0
| | | | | Change-Id: I40a221e14a1d308619e1e382b08ae16240b81ead Reviewed-by: Liang Qi <liang.qi@qt.io>
* Add qtwebglpluginJesus Fernandez2017-06-282-0/+7
| | | | | | Task-number: QTBUG-61443 Change-Id: I0a139c68c41cfa11d110fab1d7c97276c4d022a0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Update qtdeclarative onlyLiang Qi2017-06-261-0/+0
| | | | | Change-Id: Id092226dfa273fff8459b6a256ce5e5e87c364ed Reviewed-by: Liang Qi <liang.qi@qt.io>
* Download and install vc_redist 2015 on windows 7 and 8Dominik Holland2017-06-264-0/+67
| | | | | | | This is a dependency of the python3 packages for windows Change-Id: I6f45dcb1d64f43dedd883d33fdc85038c24fc501 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix the python3 packages on openSUSE 42.1Dominik Holland2017-06-131-1/+1
| | | | | Change-Id: Ie445949ac90bf6a9ce7b519bbe3c32d2d1e1a69b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add winrtrunner to common tools on Windows 10 machinesOliver Wolff2017-06-123-0/+12
| | | | | | | | | winrtrunner is needed for running auto tests on winrt. As the tool resides in qttools and not qtbase and it not changed often, it was decided to handle it similar to jom and see it as an external tool. Change-Id: I9636962df51f98bef6aad3e340c565f50e393949 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-06-1232-0/+0
| | | | | Change-Id: I23fe8d00027c73dd5ea774589853a4e22c70e402 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-06-077-0/+0
| | | | | Change-Id: I5f4b2743d35576c0b6df2ee62ec404d337974c3c Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-06-0411-0/+0
| | | | | Change-Id: Ib7ce19810c0daa4c0cf39198c580dc6baa22c74a Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-05-3013-0/+0
| | | | | Change-Id: I3a885b5f914584fa259fbd94553e8f03fb160573 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Install python3 on all platformsDominik Holland2017-05-1118-3/+174
| | | | | | Task-number: QTAUTO-345 Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove Static from the tvOS configurationJake Petroules2017-05-061-1/+1
| | | | | | | | | | This further helps with the shared library coverage on iOS-like platforms as iOS and tvOS are nearly identical, until such time iOS can be moved to shared libraries for official releases as well. Change-Id: I7dbc448890759a4e49a242d4c5bcb00f6c673f4e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Remove Static from the watchOS configurationJake Petroules2017-05-051-1/+1
| | | | | | | | | | This was unintentionally added, and helps with the shared library coverage on iOS-like platforms until such time iOS and tvOS can be moved to shared libraries for official releases as well. Change-Id: Iabae0503a0ce3fe538b97fc1941a1ccf19024429 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-05-046-0/+0
| | | | | Change-Id: Ia5664a1fa14008265e4df4b4937d6f1de96c30c9 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-05-038-0/+0
| | | | | Change-Id: I8b9a5e7630127bc423854ec2d680a51e779b2db3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Make Apple tvOS and Apple watchOS configurations availableJake Petroules2017-04-251-0/+2
| | | | | Change-Id: I53b71d04c8cdf68f136a6ca057282c656307919e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-04-2518-0/+0
| | | | | Change-Id: I662d698fcf213f2f5e936827dffafe0605309a31 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-04-218-0/+0
| | | | | Change-Id: I0ef28d11ce0ca7d1ba5c67c36748ebf377dc6787 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update Xcode 8.3.1 to macOS 10.12Tony Sarajärvi2017-04-181-4/+4
| | | | | Change-Id: Ie311d7374b74ce1179f7a8bb981733be016d387f Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-04-178-12/+171
|\ | | | | | | Change-Id: Iddf09c38c811979458639c759056a032187493de
| * Update submodules on '5.9' in qt5v5.9.0-beta2Qt Submodule Update Bot2017-04-154-0/+0
| | | | | | | | | | Change-Id: Ib3cb8cae3bbdedbaafe1e5deb3c0ca9252f010d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-04-137-7/+167
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Change-Id: Icee114ea6bd025a54db7ce34d6a0bd0dc16e767c
| | * Provisioning: Change tier1 templates for Windows 10Heikki Halmet2017-04-136-6/+162
| | | | | | | | | | | | | | | | | | | | | | | | These tier 1 templates includes changes needed by 5.9, but we can use these same tier 1 templates for 5.6 also Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Fix provision help script DownloadURL.shTony Sarajärvi2017-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | The script neglected the result of the sha1 after download. Even with a failure it exited nicely. Change-Id: I6c0e25c2b764a0ad54acbe317eddf395a56d7f1c Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-1312-0/+0
| | | | | | | | | | | | | | | Change-Id: Ice64fb51928fda825b63eef8e09f752c4a67395f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Add cmake location to PATH when provisioning macOS 10.12Konstantin Tokarev2017-04-121-0/+1
| | | | | | | | | | | | | | | Change-Id: I3afecaefced45704b77b461a2bc2869134567a2e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-1110-0/+0
| | | | | | | | | | | | | | | Change-Id: Id6c112e68c465ae52d49f4b35bee648894a35fef Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-1012-0/+0
| | | | | | | | | | | | | | | Change-Id: I9c5567a7b76101548b690dee3bba06fcdf11bd36 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Enable autotests for Ubuntu 16.04 and swap configsTony Sarajärvi2017-04-101-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As autotests pass, we can also move all existing Ubuntu 14.04 configurations to run on a more recent Ubuntu 16.04. Task-number: QTQAINFRA-1101 Change-Id: I99c4f674dc48521c66ac579c6bb1b5396c282131 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simo Fält <simo.falt@qt.io>
* | | Update qt3d manually to pull in Ubuntu 16.04 fixesSimon Hausmann2017-04-171-0/+0
| | | | | | | | | | | | | | | Change-Id: Iddea4ee53f0afd5d1b2a85d190f19e82a87d61ea Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-0926-50/+99
|\| | | | | | | | | | | Change-Id: I88192479624510cb34227f401d9e8b07977f9711
| * | Merge remote-tracking branch 'origin/5.6' into 5.9Liang Qi2017-04-083-3/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules qt.pro Commit ed8f84f149f6901cbca50d145b25fe5f43a2d54c (webengine needs tools) together with commit 5656b4848e8c8bf60274c36094dede63aa93e89b (webkit needs webengine) creates a circular dependency with qttools also depending on webkit. So this commit breaks it by swapping the serialization order between webkit and webengine. Change-Id: I36309908adb754072495e02785ad158f8b389548
| | * serialize build of qtwebkit and qtwebengineOswald Buddenhagen2017-04-062-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linking both at the same time requires more than my 16GB of RAM, so introduce a .gitmodules field which serializes the two. in practice, it is just interpreted as an optional dependency. the CI system won't be taught about it, so this will not cause an unnecessary serialization there. Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * fix url normalizationOswald Buddenhagen2017-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after 8c0390143, we cannot rely on the denormalized segment starting with a slash any more. Task-number: QTBUG-59753 Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Valentin Fokin <fokinv@inf.u-szeged.hu>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-064-0/+0
| | | | | | | | | | | | | | | Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-04-018-0/+0
| | | | | | | | | | | | | | | Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06 Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-082-0/+2
| |\ \ | | | | | | | | | | | | Change-Id: I908f38bd8cfcfd481f005a2588df5d3440eac9c5
| | * | Update submodules on '5.8' in qt5Qt Submodule Update Bot2017-04-067-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I39b5d0e9bddc2f5519cb08ac0b7b538a49a550b4 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.8' in qt5Qt Submodule Update Bot2017-04-021-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I9444728a1fa2c23e65a3f809767509a0854f1e2d Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.8' in qt5Qt Submodule Update Bot2017-04-0112-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I551f0a875c9c16acbcd768994051e85d9fcde47c Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-03-239-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Icc31f52cf5a77a4100dfd63acd32e1596ead3dad Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-03-197-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibf0175771f357c30243b5d309cfb4facc4a6b31b Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-03-1511-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac3e9b6581b2bb490c8c58ccf50cd4f14b6651a8 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * | Provision libusb for 64-bit Windows 8 and 10 as wellKari Oikarinen2017-03-142-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Amends 380fca84a9fe583e245355f2e36931473665cf0b. Change-Id: Ia6e1a3bf2465770f55201cd723b329af42984d2b Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| | * | Update submodules on '5.8' in qt5Liang Qi2017-03-0818-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic13d3040b541a4b4e9a293885ce49b0b9ba64afa Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | | Fix AltUrl of cmake for macOS provisioningKonstantin Tokarev2017-04-072-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I730a65c2fcbea14bd3fe44e01a182f095d96b0ab Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-0611-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I2ffc93d7195ab1d368a8dec8219be46acf1f74ee Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Remove special configuration for xmlpatternsSimon Hausmann2017-04-061-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 8b13ccf0238aecfe2a01e3a2e6d90620a8b9e516 in coin attempted to incrementally add OpenSuSE 42.1 support module by module, and various transitions have lead to this file. Meanwhile commit aa7531ca7d0e8f92c49a54f11460ece647ef73f1 in coin replaced OpenSuSE 13.01 globally with 42.1 for all modules, so this separate treatment is not needed anymore. Change-Id: I0e162a64816f7925a5afd5a79614a1e8843d9b7e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| * | | Enable QEMU based ARM testing for qtdeclarative with Boot2QtSimon Hausmann2017-04-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module has been changed to run a sub-set of tests. With that in place we can enable test execution, providing us with some CI test coverage for the ARM JIT, for example. Change-Id: I5b0ad68fcd4fa8fb73f59432b42ccdd9a5b6fd59 Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-0518-0/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I549dc236009aadd78fb163a2a26b2384bb7de9ab Reviewed-by: Liang Qi <liang.qi@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 06:15:31 +0000