aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on '5.9.2' in qt5v5.9.2Qt Submodule Update Bot2017-10-032-0/+0
| | | | | Change-Id: I8bc573e915e725e784789f0e3ddbd40add801b42 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update submodules on '5.9.2' in qt5Qt Submodule Update Bot2017-10-0215-0/+0
| | | | | Change-Id: I17daa24ba582f0fe85097f04e48a6bc6378a1b3c Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update submodules on '5.9.2' in qt5Qt Submodule Update Bot2017-09-2528-0/+0
| | | | | Change-Id: I7d9d8fc249fc315ab67382fdb1de77daacb1e30d Reviewed-by: Liang Qi <liang.qi@qt.io>
* Adjust submodule branchesOswald Buddenhagen2017-09-201-39/+39
| | | | Change-Id: I4cf45c3fb92fadf5724e0941789a7fa545625753
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-1812-0/+0
| | | | | Change-Id: I46cf8a6f861952ceed6a36ae1b2cb7ca2b103fb8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Clean up QNX patchingSimon Hausmann2017-09-162-2/+2
| | | | | | | | Get rid of COIN_WEBSERVER_ADDRESS and download the QNX C++11 patches from ci-files01 instead. Change-Id: I7c32bfc1e1abef59b1e419e7dcdb73a5b16a895f Reviewed-by: Simo Fält <simo.falt@qt.io>
* Update submodules on '5.9' in qt5Liang Qi2017-09-138-0/+0
| | | | | Change-Id: I352ed23b7e7a025b1e1730f15a5c0ecc60497c52 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Build examples also on Linux with namespacesSimon Hausmann2017-09-121-1/+1
| | | | | | | | | | With this change we get coverage for namespace related build breakages in examples of Linux-only modules, such as wayland. Change-Id: Id9464140059c459a19ce702d6b21a552f8137a2c Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* Install python3 on all platformsDominik Holland2017-09-124-1/+25
| | | | | | | | | | | | | This forward-ports commit a99d3432f71c4be5045ae2cdcc3b7070de5abe23 to 5.9, which should have been done in 6bf5691ca87dd4dcf9386a4c6320be2c39db6dcb but accidentally left out. It reuses parts of commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74 that was initially cherry-picked to 5.6. Task-number: QTAUTO-345 Task-number: QTBUG-63133 Change-Id: Ib401dd06bfc4d4aaf8b8ce1a8509697993d4397e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update submodules on '5.9' in qt5Liang Qi2017-09-1117-0/+0
| | | | | Change-Id: I9897024607ffd0e320ad56fa8ab1d9d4ceacc6c2 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Provision openSUSE 42.3 and add to CITony Sarajärvi2017-09-066-1/+68
| | | | | | | | | | | Replaces 42.1 that isn't supported anymore by openSUSE.org. Task-number: QTQAINFRA-1257 Task-number: QTQAINFRA-1259 Change-Id: I660f812ec27a28d413dc52657985c41d1b8dab01 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-0612-0/+0
| | | | | Change-Id: I96537e757b58500804180cb579d4777e6abbfc96 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Use 64-bit host for VS2017 builds of QtWebKitKonstantin Tokarev2017-09-051-1/+1
| | | | | | | Change-Id: I92bec3662bf39fb5a3572f093af09b2b75bda589 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
* Provisioning: Fix helper function's mktemp in macOS 10.10Simo Fält2017-09-041-1/+6
| | | | | | | | It seems that macOS 10.10 has a non standard mktemp command. It doesn't work as expected but prints usage and exit instead. Change-Id: I37be6eb01474466c2b6bbae4f38876673bd9c295 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-09-0223-0/+0
| | | | | Change-Id: I8d2a3b3c53ef50f543e69d8824e2ec95939956aa Reviewed-by: Liang Qi <liang.qi@qt.io>
* Prefer apt-get over apt in scriptsFrederik Gladhorn2017-09-021-18/+18
| | | | | | | | | apt explicitly warns that it doesn't have a stable UI, so it shouldn't be used in scripts. This should have no implications in practice. Change-Id: Id0bb0d44e73b80a19f6ba4ca1aa4d92c09d10a92 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Provisioning: Add variables properly in .bashrcTony Sarajärvi2017-09-021-2/+2
| | | | | | | | | | | If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Ie2c64764f9e0a676307cb3a144162cbc35eb33fb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Swap B2Qt branch to MortyTony Sarajärvi2017-09-022-2/+2
| | | | | | Task-number: QTQAINFRA-1364 Change-Id: I9b114d2cbea60928fac4aa8dec9721099b92f5f6 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.9Simon Hausmann2017-08-3126-216/+331
|\ | | | | | | | | | | | | | | | | Conflicts: coin/provisioning/common/InstallPKGFromURL.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh Change-Id: I87b10d75250eecd5271be201fdf6b1d27cc5a791
| * Install python3 on all platformsSimo Fält2017-08-3018-1/+319
| | | | | | | | | | | | | | | | | | | | | | Python3 is required in 5.6 by pyside-setup. Task-number: QTAUTO-345 Change-Id: If11ca425fa08cce8a518710ded0a6ec58159343d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit a5f3f8ed482d314d092e1a6ddc5568839bb59c74) (cherry picked from commit a7658388892bc70c3c5f3a6f6e31639ef5b766d1) (cherry picked from commit 1859f9b26ce0177cb83e917148b10ff08bb25db7)
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-305-0/+0
| | | | | | | | | | Change-Id: If6a7d9a6d34a5e25459c1c3bca1ef55f923eeeae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Fix code duplication for cmake installation on LinuxSimon Hausmann2017-08-303-106/+55
| | | | | | | | | | | | | | Share the code for installing cmake on Linux. Change-Id: I535f2696151ea4db26dc7194a1fe7016799ed0e2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Fix adding to path lines for Windows provisioning scriptsJoni Jäntti2017-08-302-1/+6
| | | | | | | | | | | | | | | | | | | | | | Currently the path addition command will forget the previous addition when adding a new string. This hasn't been found out because python was the only script using this command. Now we also need to set the path for ruby, so the python string is left out. Change-Id: I39721d78111550189e52a9f095030033f9660c0a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
| * Provisioning: Fine tune cmake provisioning scriptTony Sarajärvi2017-08-301-4/+51
| | | | | | | | | | | | | | | | Add version printing and move version strings to variables for easier reuse. Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
| * Provisioning: Add $PATH properly in .bashrcTony Sarajärvi2017-08-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | If we, in a provisioning script, add $PATH to another file, that $PATH gets expanded there and now. We need it written as $PATH to the target file, so that it gets expanded when the other file is run. Not at the moment of running this provisioning script. Change-Id: Id963f0f8b1cc74b02d35c1a91eb974ed816839ab Reviewed-by: Simo Fält <simo.falt@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-294-0/+0
| | | | | | | | | | Change-Id: I89cafd064580d98afb8c55c82465bc3348652ff3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix cmake and python installation on RHEL 7.2 and OpenSuSE 42.1Simon Hausmann2017-08-293-0/+111
| | | | | | | | | | | | | | | | | | | | | | | | The merge commit 74eb853384473dbe18123f9731b6f9529d68d2cf accidentally brought forward the removal of files from commit 49ccf716dca2a14d21ce6869cdcd64b861c53834 that were not supposed to propagate. Change-Id: Ia5d6b2205c75f0856c3fed104149980c75a55840 Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-283-0/+0
| | | | | | | | | | Change-Id: I96b67c72364dabaf6bbefbcf561104bbd01ee6b3 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-283-0/+0
| | | | | | | | | | Change-Id: Ibf7a0094c2e06fdf7b1f62eaf90d6e4f6c6e1161 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Fix target architecture for Boot2Qt declarative testsSimon Hausmann2017-08-251-1/+1
| | | | | | | | | | | | | | | | | | Amends 7456e028a701ff31f63a465fb8fadca63c453b97 and therefore allows the re-use of the boot2qt build artifacts. Change-Id: I4b01bf13e0004c4c3c3a2be00b02760e0ad3ffdd Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-258-0/+0
| | | | | | | | | | Change-Id: Ia93843e106a111a79740fe9b5a55eb177259dcfe Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Enable developer mode on macOS platformsAlexandru Croitor2017-08-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when a VM user tried to attach lldb to a process via ssh, lldb would fail with the following error message: "error: process exited with status -1 (unable to attach)". If this were done over VNC rather than ssh, the user would instead get a UI popup to enter a password to allow debugging the process. When trying to debug an application using Xcode for the first time, Xcode will offer to enable the so called "Developer Mode" which allows attaching a debugger without specifying a password every time. This change enables "Developer Mode", so that every VM user doesn't have to. Change-Id: Ie4e473a982c908afd456ac1773bbdaf4ce778094 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-2415-0/+0
| | | | | | | | | | Change-Id: I12a0463f0b91624649abe6da4cb745f6c20ed69f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Provisioning: Install libclang and its dependencies to macos 10.12Simo Fält2017-08-233-0/+13
| | | | | | | | | | | | | | | | | | Libs and llvm-config is required by pyside. In order to extract libclang package, we need to install 7zip. 7zip is installed with homebrew. Change-Id: I35367dca1f79dbc9e2f1513480f6fc9bb69730d3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.9Liang Qi2017-08-2276-263/+808
|\| | | | | | | | | | | | | | | | | | | | | | | Move the Documentation feature to the corresponding Ubuntu 16.04, where the CI would have used it by magic. Conflicts: coin/platform_configs/default.txt coin/platform_configs/qt5.txt Done-with: Frederik Gladhorn<frederik.gladhorn@qt.io> Change-Id: I885ce572710480cd15ecdc8cfac7edb52957f92a
| * Provisioning: Disable system updatesHeikki Halmet2017-08-165-0/+56
| | | | | | | | | | | | | | | | This change will disable system updates from App Store to prevent unnecessary network load Change-Id: I7915ec6ffce681a850abef59d58f953effd6deb0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-165-0/+0
| | | | | | | | | | Change-Id: I5e3b9c2b92ee4403054820cd6a902c9dfbac0e0f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Make CI use a new win 8.1 provisioning instead of win 8Joni Jäntti2017-08-1159-206/+810
| | | | | | | | | | | | | | | | | | | | | | | | | | Added all the provisioning scripts that install required programs and make changes to certain settings. These are needed to build qt5. This replaces the old Windows 8 template. Made all the Windows platforms use the scripts under provisioning/common/ instead of duplicate files. Task-number: QTQAINFRA-1357 Change-Id: Ic3f0b50079b212437fff711379f243753ab84872 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update provisioning scripts with new intra.qt.io addressTony Sarajärvi2017-08-0814-20/+20
| | | | | | | | | | Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-082-0/+0
| | | | | | | | | | Change-Id: I3fc0805275d848bc4323e521ecfdf5cc06a518f4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-061-0/+0
| | | | | | | | | | Change-Id: I5e7608f87019c2aed077dc85963b1c349c17824e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-052-0/+0
| | | | | | | | | | Change-Id: I3da0ef78a783a692825f8bc7000d28c8b35fb7b6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Remove unused provisioning scriptsSimon Hausmann2017-08-047-167/+0
| | | | | | | | | | | | | | | | | | RHEL 7.2, Ubuntu 15.04, 16.04 and OpenSuSE 42.1 are not used in the Qt 5.6 branch. Let's remove the scripts to avoid confusion. Change-Id: I3829ea320ad77ebd25c9cf5bebfeed89f37f44dc Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Add Documentation feature to one Ubuntu 14.04 buildFrederik Gladhorn2017-08-041-1/+1
| | | | | | | | | | | | | | | | | | When creating packages, we build the docs on one configuration. Previously that was done by magic inside the continuous integration system. Make it a bit less magic by having a flag for it. Change-Id: Iee5be7037023929b319beffaacb1592dc87d6078 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-08-014-0/+0
| | | | | | | | | | Change-Id: Ic0bc89be8a9b0d3dda06f6f43bbe21e60032a65f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Turn off line ending conversion for .commit-templateJoerg Bornemann2017-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When committing a change, the automatically generated git commit message consists of 1) The content of .commit-template 2) Informative text for the current commit, generated by git. While 2) always has LF line endings, even on Windows, 1) might have CRLF line endings if core.autocrlf=true. The result is a text with mixed line endings. With the default editor vim, every line of the commit template part ends with ^M. Fix this by forcing the line endings of .commit-template to be LF regardless of core.autocrlf. Change-Id: I6db825695466d7f48f1fa4f771d83fb872fdb576 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Use libusb compiled with MSVC 2015Kari Oikarinen2017-08-214-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | QDB has to change to using Windows 10 for releases, because Windows 8.1 is no longer available for non-qt5 builds as a packaging platform in 5.9 branch. Don't provision libusb on earlier Windows versions, since they don't have a compatible compiler. Change-Id: I771a24fcf208c4961483a39e51cb7d95f004ed55 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | Do not use font files from boot2qt toolchainSami Nurmenniemi2017-08-211-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously font configuration files were used from the host system. Updating the toolchain to Morty introduces Cantarell font which causes toolchain fonts to be used by Qemu. This change forces also the actual font files to be used from the host system regardless of what is in the toolchain. Task-number: QTBUG-62528 Change-Id: I00de0baa952c9b898edc6b9da8d1d8814f6c722b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Remove outdated provisioning scriptsFrederik Gladhorn2017-08-196-120/+0
| | | | | | | | | | | | | | | | Ubuntu 14.04 and OS X 10.8 are no longer relevant Change-Id: Ib18dda605501fbbf2a6cac578a1b34d82102fae4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Provisioning: Install libclang to OpenSUSESimo Fält2017-08-171-0/+9
| | | | | | | | | | | | | | | | The script will install custom package, which is known to match with pyside requirements. Change-Id: I28ff7877ef1bba50f8d32007af87e70c0ddc398a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 03:02:16 +0000