This forward-ports commit a99d3432f7
to 5.9, which should have been done in
6bf5691ca8 but accidentally left out.
It reuses parts of commit a5f3f8ed48
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>
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>
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>
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>
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 a5f3f8ed48)
(cherry picked from commit a765838889)
(cherry picked from commit 1859f9b26c)
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>
Add version printing and move version strings to variables for
easier reuse.
Change-Id: I5372872bf455609dfb7cc7bbcf7a110cd71933fb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
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>
The merge commit 74eb853384 accidentally
brought forward the removal of files from commit
49ccf716dc 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>
Amends 7456e028a7 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>
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>
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>
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
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Conflicts:
coin/platform_configs/default.txt
This also reverts c9d5341307 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
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>
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>
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>
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>
MinGW packages will be upgraded in another patch.
Task-number: QTBUG-61728
Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Also upgrade to Conan 0.24.0.
Task-number: QTBUG-61829
Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
We need to use x86 packages from qtci-windows-10-x86_64 configuration,
so splitting Conan manifests by configuration is not a good idea anymore.
Task-number: QTBUG-61829
Change-Id: I8b2fc00865cce372ca6b5ec75b4775d345d0d18f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Some of the macOS templates are cleaner than others and are mising some
basic tools like 7z. Homebrew provides easy way to install wide range of
tools via command line.
Change-Id: I5a8528bb4a13ef9a72e2467c51a8b5d45f9a3d84
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
PySide versions following 5.6 use a C++ parser based on Clang.
The Clang library (C-bindings), version 3.9 or higher is
required for building.
Change-Id: Ia7bcad46e3214d6d8b688354c9abdc83a513573c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Makefile-based generators of CMake are much less efficient than Ninja. They
generate bloated Makefiles that call back to cmake often. Main offender on
Windows is cmake_depends command which seems to do lots of disk reads.
QtWebKit can now switch to ninja automatically if it's present in PATH.
This should help to reduce build times.
Change-Id: I33d3f4d766a630f8ca4fb64b719fe2e8a5c2e00c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
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>
