Commit Graph

1849 Commits

Author SHA1 Message Date
Simon Hausmann
207eb4069b Fix cmake and python installation on RHEL 7.2 and OpenSuSE 42.1
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>
2017-08-29 10:23:22 +00:00
Qt Submodule Update Bot
b663966026 Update submodules on '5.9' in qt5
Change-Id: I96b67c72364dabaf6bbefbcf561104bbd01ee6b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-08-28 17:16:10 +00:00
Qt Submodule Update Bot
be3e818688 Update submodules on '5.9' in qt5
Change-Id: Ibf7a0094c2e06fdf7b1f62eaf90d6e4f6c6e1161
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-08-28 04:17:37 +00:00
Simon Hausmann
3a000ed41a Fix target architecture for Boot2Qt declarative tests
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>
2017-08-25 09:08:10 +00:00
Qt Submodule Update Bot
3dc3ceb646 Update submodules on '5.9' in qt5
Change-Id: Ia93843e106a111a79740fe9b5a55eb177259dcfe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-08-25 08:27:15 +00:00
Alexandru Croitor
dfaabde5dc Enable developer mode on macOS platforms
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>
2017-08-24 04:49:06 +00:00
Qt Submodule Update Bot
f1b1f3dc09 Update submodules on '5.9' in qt5
Change-Id: I12a0463f0b91624649abe6da4cb745f6c20ed69f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-24 04:49:02 +00:00
Simo Fält
9d65cd5ca5 Provisioning: Install libclang and its dependencies to macos 10.12
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>
2017-08-23 05:50:26 +00:00
Liang Qi
74eb853384 Merge remote-tracking branch 'origin/5.6' into 5.9
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
2017-08-22 08:22:02 +02:00
Kari Oikarinen
c2493f9d6d Use libusb compiled with MSVC 2015
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>
2017-08-21 17:49:27 +00:00
Sami Nurmenniemi
79db6fc856 Do not use font files from boot2qt toolchain
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>
2017-08-21 09:39:57 +00:00
Frederik Gladhorn
896bb94c74 Remove outdated provisioning scripts
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>
2017-08-19 14:51:39 +00:00
Simo Fält
629e24b979 Provisioning: Install libclang to OpenSUSE
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>
2017-08-17 19:52:48 +00:00
Simo Fält
62c6676f87 Provisioning: Install pip for macOS 10.12
Pip is required to provision python packages.

Change-Id: I73ab7556bb6b9ccc57ef078f422bfbba4bfed6a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:41 +00:00
Simo Fält
3690fe06a4 Provisioning: Update CMake on osx 10.10
Pyside requires cmake 3.1.0 or more recent.

Change-Id: Ic376d5e5af9f9b0692a2de7c4ec35e6c8bfa9465
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:35 +00:00
Tony Sarajärvi
f238362a4b Provisioning: move installing Android NDK and SDK back in line
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>
2017-08-17 19:52:29 +00:00
Tony Sarajärvi
7db6a1cd0f Provisioning: Reduce verbosity of uncompressing Xcode
Change-Id: Id09ace3fcdf53c3b6921ed277c9fe571b5c43e3b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-17 19:52:24 +00:00
Simo Fält
c9f842af84 Provisioning: Install virtualenv for macOS 10.12
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>
2017-08-17 19:52:18 +00:00
Kari Oikarinen
1720ed0b6f Adapt comments to qdb repository move
Change-Id: I3ecdc952d1323a14471cdc87b6854b857d4297a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-16 18:57:26 +00:00
Kari Oikarinen
890a478e07 Update libusb version
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>
2017-08-16 18:57:15 +00:00
Heikki Halmet
5df417aeb9 Provisioning: Disable system updates
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>
2017-08-16 06:03:50 +00:00
Qt Submodule Update Bot
15b608cbc5 Update submodules on '5.6' in qt5
Change-Id: I5e3b9c2b92ee4403054820cd6a902c9dfbac0e0f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-16 06:03:42 +00:00
Simon Hausmann
5a0dc401fa Remove QtWebKit and QtWebKit examples from Qt 5
They are subject to a separate release.

Change-Id: I5ef12b2bbe299da4838be7681e074b70da798262
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
2017-08-15 19:01:35 +00:00
Qt Submodule Update Bot
d5967be094 Update submodules on '5.9' in qt5
Change-Id: Ia834fffa1951ba804dbf76af3d62652b17d947db
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-15 19:01:28 +00:00
Joni Jäntti
bd3ddeddd2 Make CI use a new win 8.1 provisioning instead of win 8
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>
2017-08-11 16:49:10 +00:00
Tony Sarajärvi
043e54c7c6 Update provisioning scripts with new intra.qt.io address
Change-Id: I9b4c5e9d0fe8e0e84596ad9086f563d11e97930b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-08 20:05:08 +00:00
Qt Submodule Update Bot
e4ba13a038 Update submodules on '5.6' in qt5
Change-Id: I3fc0805275d848bc4323e521ecfdf5cc06a518f4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-08 20:05:02 +00:00
Qt Submodule Update Bot
d841f90122 Update submodules on '5.6' in qt5
Change-Id: I5e7608f87019c2aed077dc85963b1c349c17824e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-06 11:47:29 +00:00
Qt Submodule Update Bot
55227444e3 Update submodules on '5.6' in qt5
Change-Id: I3da0ef78a783a692825f8bc7000d28c8b35fb7b6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-05 05:47:53 +00:00
Simon Hausmann
49ccf716dc Remove unused provisioning scripts
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>
2017-08-04 19:22:40 +00:00
Frederik Gladhorn
d1d36cbbf1 Add Documentation feature to one Ubuntu 14.04 build
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>
2017-08-04 16:12:56 +00:00
Harald Vistnes
830f8ac7f2 Make Qt3D depend on qtbase and optionally on qtdeclarative
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>
2017-08-02 05:30:16 +00:00
Qt Submodule Update Bot
c60e90a2c8 Update submodules on '5.6' in qt5
Change-Id: Ic0bc89be8a9b0d3dda06f6f43bbe21e60032a65f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-08-01 04:22:00 +00:00
Tony Sarajärvi
36d7e7a8da Update Xcode to 8.3.3 in macOS 10.12
Change-Id: I990d2ac89044a5afc6170da9f5c22bc144021036
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-07-31 20:16:46 +00:00
Paolo Angelelli
74fa40d978 Replace QNX7 target with QNX6.6 for all Qt modules
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>
2017-07-26 14:11:29 +00:00
Joerg Bornemann
5958b8d3f0 Turn off line ending conversion for .commit-template
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>
2017-07-21 05:44:28 +00:00
Simon Hausmann
f56f2c20c4 Merge remote-tracking branch 'origin/5.6' into 5.9
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
2017-07-19 13:24:43 +02:00
Simo Fält
c9d5341307 Provisioning: Fix virtualenv in macOS 10.11
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>
2017-07-19 05:54:01 +00:00
Jędrzej Nowacki
eca392d3f3 Use updated Ubuntu 14.04 in CI
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>
2017-07-18 16:59:07 +00:00
Jędrzej Nowacki
8b9a8c489f Use updated Ubuntu 16.04 in CI
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>
2017-07-18 11:44:27 +00:00
Qt Submodule Update Bot
88cb7f4264 Update submodules on '5.6' in qt5
Change-Id: Id5ae5de68635938bc402242a3d98cb3765154d43
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-12 06:30:41 +00:00
Friedemann Kleint
1bdbe06c82 MSVC: Run tests with MSVC2017 instead of MSVC2013
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>
2017-07-11 03:30:44 +00:00
Qt Submodule Update Bot
f8d8257579 Update submodules on '5.9' in qt5
Change-Id: I113ebb2db59a55786929361437a17536a0131676
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-11 03:30:38 +00:00
Qt Submodule Update Bot
70c5a5bb97 Update submodules on '5.9' in qt5
Change-Id: I3ab9f3aa74c97094076a9c385a152d1af7b6a876
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-10 05:11:16 +00:00
Konstantin Tokarev
bbf18ab4ad Add Packaging configs for VS2017 and MinGW to stand-alone QtWebKit builds
Change-Id: I6a51f733d310d8542b184e813f49f1500666d6ee
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:56 +00:00
Konstantin Tokarev
dd5096c6c7 Conan: update ICU to 59.1, added VS2017 packages
MinGW packages will be upgraded in another patch.

Task-number: QTBUG-61728
Change-Id: Ie6a1996b7850282a7cdcbe5ceba61f1ce473cf69
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:54 +00:00
Konstantin Tokarev
6837a847bb Provisioning: install x86 conan packages on MSVC2015-x86_64 Win 10 host
Also upgrade to Conan 0.24.0.

Task-number: QTBUG-61829
Change-Id: Ia01609e5f2d8121eb216b03bc8e95bca7225042e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-09 04:51:51 +00:00
Konstantin Tokarev
a96119c121 Provisioning: move Conan manifests to common directory
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>
2017-07-09 04:51:48 +00:00
Simo Fält
5f37f812f9 Provision homebrew
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>
2017-07-08 07:23:16 +00:00
Simo Fält
0001d102f8 Provision libclang
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>
2017-07-08 07:23:09 +00:00