summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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>
* | | Remove fonts-noto-cjk on Ubuntu-16.04-x86_64 provision imageSami Nurmenniemi2017-04-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First test using QFont fails if fonts-noto-cjk is installed. This happens because running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache doesn't help since host version creates cache for a wrong architecture and running armv7 fc-cache segfaults on QEMU. Change-Id: I6667b29ad4c4cae8d242e3af63defb603a6e6ec7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.6' into 5.9v5.9.0-beta1Liang Qi2017-04-0318-44/+84
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt This also fixes the 7Z extraction code to work on the windows 7 x86 installation where 7z is not in the PATH anymore with revision 2. The fallback code was 64-bit only and needs the null check for ProgramFiles(x86) along with the fall back to ProgramFiles to locate the 7z executable. Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
| * | Provisioning: Bug fix patch for msvc 2015 update 3Heikki Halmet2017-03-312-0/+100
| | | | | | | | | | | | | | | | | | | | | This bug fix patch is needed for QtWebEngine Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Coin provisioning: Use arg instead of autodetecting architectureSimo Fält2017-03-3012-32/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | When provisioning windows machine, it seems that detecting architecture by checking [System.Environment]::Is64BitProcess doesn't work properly. Instead pass 32 or 64 as an argument when calling powershell script. Change-Id: I890ad141b8ef194275848d0e656431753463cd2b Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * | Provisioning: Move Visual Studio installation to pre-provisioningHeikki Halmet2017-03-226-71/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studios will be pre-provisioned to tier1/vanilla os when visual studio update is needed. Even if using pre-configured offline installer with specific workload and components the installation is still taking too long. This way we'll reduce provisioning time significantly Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
| * | Update submodules on '5.6' in qt5Liang Qi2017-03-201-0/+0
| | | | | | | | | | | | | | | Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Reflect current URL in example commentJason Erb2017-03-161-1/+1
| | | | | | | | | | | | | | | Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Update submodules on '5.6' in qt5Liang Qi2017-03-163-0/+0
| | | | | | | | | | | | | | | Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Remove init-repository assumption of repo url “…/qt/<repo>”Jason Erb2017-03-131-7/+7
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-59355 Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Provision: Storage icu version to versions.txtHeikki Halmet2017-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | | ~/versions.txt will be used to storage sw version information Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| * | Update submodules on '5.6' in qt5Liang Qi2017-02-254-0/+0
| | | | | | | | | | | | | | | Change-Id: I6676715446aa572b96f4abe7d3d8932817bfaed1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update qtserialbus manuallyLiang Qi2017-04-011-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic4e1200a5d75e0c7b33fcb43efb27706260e3202 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-04-0116-0/+0
| | | | | | | | | | | | | | | Change-Id: I64a699afde6c7444abfad5d0cac19f2d1d332f7f Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.9' in qt5Liang Qi2017-03-3014-0/+0
| | | | | | | | | | | | | | | Change-Id: I7dfea76bca9df8ab4db1be65068ffa46b414ad3d Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.9' in qt5Liang Qi2017-03-2816-0/+0
| | | | | | | | | | | | | | | Change-Id: Iefd15fd52d2300981820cb1b067f512228100503 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.9' in qt5Liang Qi2017-03-198-0/+0
| | | | | | | | | | | | | | | Change-Id: Id9f9836551a35fba5ccd12be449f9c4a92acf486 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Update submodules on '5.9' in qt5Liang Qi2017-03-1824-0/+0
| | | | | | | | | | | | | | | Change-Id: I210324952a0126cd656344eebee2dbd6a32f6dc1 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Install g++-multilib on Ubuntu 16.04 platformsAllan Sandfeld Jensen2017-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to cross-build to 32bit x86 which WebEngine needs for Boot2Qt ARM builds. Task-number: QTBUG-59504 Change-Id: I9851d97949dc67c6f564cf09443b0a04998b2590 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Remove command line tools from macOS 10.11 and 10.12Tony Sarajärvi2017-03-154-222/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt should not require command line tools to be installed. When they are installed, we can accidentally rely on on the tools instead of sysroot. Task-number: QTBUG-58325 Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Recommend qtquickcontrols2 for qtlocationPaolo Angelelli2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The MapViewer example now uses qtquickcontrols2 sliders. This patch adds the related dependency Change-Id: I50db8e6355ee02b61dcd7a4230fafc1fd060fe3d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-03-1333-0/+0
| | | | | | | | | | | | | | | Change-Id: Id6e972d67243340551b0cae64619428a8f601f4c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Fix network test server setupSimon Hausmann2017-03-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the correct IP address for the network test server that all the other machines are using as well. Change-Id: I1ffe4b6f5851bcb06dc2d39265979b799715ec3f Task-number: QTBUG-59241 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>