aboutsummaryrefslogtreecommitdiffstats
path: root/coin
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into ↵v5.10.0-alpha1Jani Heikkinen2017-09-1021-135/+221
|\ | | | | | | refs/staging/5.10
| * Merge remote-tracking branch 'origin/5.9' into 5.10Simon Hausmann2017-09-0621-135/+221
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: coin/platform_configs/default.txt coin/platform_configs/qtdeclarative.txt coin/provisioning/common/InstallPKGFromURL.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh Change-Id: Id174b48e650ed18fbba48b4fc617ee075b0586ec
| | * 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>
| | * 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>
| | * 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)
| | | * 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>
| | * | 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>
| | * | 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>
* | | | Provisioning: Install paho mqtt brokerMaurice Kalinowski2017-09-1014-0/+323
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The paho broker is used for testing the Qt Mqtt module, specifically the client classes. Change-Id: I252a337eb0454e871669a467dba2d9a379fb33d5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* | | Swap B2Qt branch to PyroTony Sarajärvi2017-09-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTQAINFRA-1364 Change-Id: I55906a90e26dccd8d32e686368530f27e46e67fc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io> Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-2497-370/+890
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qt5.txt coin/provisioning/common/system_updates.sh coin/provisioning/qtci-linux-RHEL-7.2-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/08-pythondev.sh coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/freeopcua.sh coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Change-Id: Id9c38f3cda85b82fc20fb4a1f2ec71aa18646d94
| * | 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>
| * | 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-2275-262/+807
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * 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>
| | * 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>
| * | 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>
| * | Provisioning: Install pip for macOS 10.12Simo Fält2017-08-172-0/+9
| | | | | | | | | | | | | | | | | | | | | Pip is required to provision python packages. Change-Id: I73ab7556bb6b9ccc57ef078f422bfbba4bfed6a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provisioning: Update CMake on osx 10.10Simo Fält2017-08-173-50/+58
| | | | | | | | | | | | | | | | | | | | | Pyside requires cmake 3.1.0 or more recent. Change-Id: Ic376d5e5af9f9b0692a2de7c4ec35e6c8bfa9465 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provisioning: move installing Android NDK and SDK back in lineTony Sarajärvi2017-08-171-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installing the NDK and SDK takes a lot of time and finding potential other problems require us to first download the entire Android SDK. By moving it back in line, we first make sure the other stuff work before taking care of this. Change-Id: Ibae82dca247c8ae063548dbafa5a348102bf8ddb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provisioning: Reduce verbosity of uncompressing XcodeTony Sarajärvi2017-08-171-1/+1
| | | | | | | | | | | | | | | Change-Id: Id09ace3fcdf53c3b6921ed277c9fe571b5c43e3b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Provisioning: Install virtualenv for macOS 10.12Simo Fält2017-08-172-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Python virtualenv command is used when building pyside modules, which installs additional Python modules during build time and requires access to installation directories. Change-Id: Id34ac8b36710ba04d8db263acdaf2bd31e314de8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Adapt comments to qdb repository moveKari Oikarinen2017-08-161-2/+2
| | | | | | | | | | | | | | | Change-Id: I3ecdc952d1323a14471cdc87b6854b857d4297a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update libusb versionKari Oikarinen2017-08-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use an unreleased version that does not have a crash on Windows 7, since there is not yet an official release that would include the fix. Task-number: QTBUG-62430 Change-Id: I14d83d01fe3d4b0bfebe7514fbec7d25e99af731 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | 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.9' into devSimon Hausmann2017-07-2610-23/+80
|\| | | | | | | | | | | Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
| * | 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>
| | * 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>
| * | 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 freeopcua versionMaurice Kalinowski2017-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | And also moved to Ubuntu 16.04 as we're not testing 14 anymore. Change-Id: I3fd12a1ff290e564f15a557da33ce3c0008b4f81 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-14107-820/+2212
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules coin/platform_configs/qt5.txt Remove QNX Windows builds, 0358b6d2 Remove Integrity build temporarily, QTBUG-61702 coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh Done-with: Liang Qi <liang.qi@qt.io> Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
| * | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 23:33:20 +0000