summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update submodules on 'dev' in qt5Liang Qi2017-08-2541-0/+0
| | | | | Change-Id: I7192cbb513f05320c792a29a598b535bcd469d85 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-24101-390/+894
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * 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>
| * | 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>
| * | Remove QtWebKit and QtWebKit examples from Qt 5Simon Hausmann2017-08-153-17/+1
| | | | | | | | | | | | | | | | | | | | | They are subject to a separate release. Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-08-1529-0/+0
| | | | | | | | | | | | | | | Change-Id: Ia834fffa1951ba804dbf76af3d62652b17d947db Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Make Qt3D depend on qtbase and optionally on qtdeclarativeHarald Vistnes2017-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will make the pure C++ libs of Qt3D be built even if qtdeclarative is skipped. Task-number: QTBUG-62256 Change-Id: I0cdf19a57d1d8eca065e19a21e88193c5dcb5eb6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | 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>
* | | Update submodules on 'dev' in qt5Qt Submodule Update Bot2017-07-2916-0/+0
| | | | | | | | | | | | | | | Change-Id: Ic68d5b4cc41971eb619f2ba32097612aa20df3b1 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>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-123-0/+0
| | | | | | | | | | | | | | | Change-Id: Id5ae5de68635938bc402242a3d98cb3765154d43 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-062-0/+0
| | | | | | | | | | | | | | | Change-Id: I8701d1b838be1730ccaaa2835c47e0389bb4bcc3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-07-041-0/+0
| | | | | | | | | | | | | | | Change-Id: I5f1e4425bf98dd9fba31f21392dfec9d991ebf7d Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-303-0/+0
| | | | | | | | | | | | | | | Change-Id: I077670116fb8fa2fdce44a0260aacfedf16234c6 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-264-0/+0
| | | | | | | | | | | | | | | Change-Id: I0c2e8c0756239c679a2442c164c1eafa5b21f84e Reviewed-by: Liang Qi <liang.qi@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>
| | * Update submodules on '5.6' in qt5Qt Submodule Update Bot2017-06-176-0/+0
| | | | | | | | | | | | | | | Change-Id: I6c6a2f3d51f4899809810123112081a47f054358 Reviewed-by: Liang Qi <liang.qi@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 submodules on '5.9' in qt5Qt Submodule Update Bot2017-07-114-0/+0
| | | | | | | | | | | | | | | Change-Id: I113ebb2db59a55786929361437a17536a0131676 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update submodules on '5.9' in qt5Qt Submodule Update Bot2017-07-1010-0/+0
| | | | | | | | | | | | | | | Change-Id: I3ab9f3aa74c97094076a9c385a152d1af7b6a876 Reviewed-by: Liang Qi <liang.qi@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>