Commit Graph

1905 Commits

Author SHA1 Message Date
Jędrzej Nowacki
ee8327928d Provision 32 bit libclang on all Windowses
Up to now we were always matching host architecture for
clang version to install. It is not good enough as in
some cases (all?) we build qdoc, which depends on clang,
as 32 bit app, that can not link to 64 bit clang.

Change-Id: I7b635f38821533da32d721e5e55f0067d4d0f62e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-10-05 17:50:37 +00:00
Liang Qi
cdab32be23 Update submodules on 'dev' in qt5
Change-Id: I309c7e0fffbcd8b18c9bacf1587bd247687d9c95
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-05 07:12:25 +00:00
Qt Submodule Update Bot
452814565e Update submodules on 'dev' in qt5
Change-Id: If80a73c6fbdd0b790df76802e85f85a05d21dc33
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-25 05:06:37 +00:00
Qt Submodule Update Bot
f07e18248f Update submodules on 'dev' in qt5
Change-Id: I1dbe69b48fd449b4336c994fc0b4d6b1385327e5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-23 18:32:29 +00:00
Qt Submodule Update Bot
bfec1f8e3b Update submodules on 'dev' in qt5
Change-Id: I5aedaf510d296b0ab7707e7ddb89affebc28fdce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-22 04:23:19 +00:00
Liang Qi
5141ac6418 Update submodules on 'dev' in qt5
Change-Id: I0030602560b9e47939557c8bcea9abeb8652b373
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 13:01:07 +00:00
Alex Blasche
92b8f50bfa Introduce qtopcua to top-level Qt builds
Change-Id: Iaf9e137c0ae08cc527e14a394cfaf235dfce13fe
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 07:09:06 +00:00
Tony Sarajärvi
664ce64f24 Provisioning: Add QNX 7.0 SDP in macOS 10.12
Task-number: QTQAINFRA-1190
Change-Id: I2edb16464fa320a8e3beabea32ad673f8d6d0352
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-01 19:24:15 +00:00
Tony Sarajärvi
0dbc2a3aaf Add QNX7 as a build target on macOS 10.12 hosts
Task-number: QTQAINFRA-1189
Change-Id: Ica11a1ca1dc7b306da243f719ff48dce4d03d271
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-01 19:24:04 +00:00
Qt Submodule Update Bot
4ad6292028 Update submodules on 'dev' in qt5
Change-Id: Id6afc51f57495e9416bdad103292a4be5503049e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-30 11:23:31 +00:00
Martin Smith
cf92d02d8a Provision Ubuntu 16.04 with libclang
It is needed for QDoc.

Task-number: QTBUG-62532
Change-Id: Icfc7d0af8a90cf827f4d6468e95f5aa002872102
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-29 04:32:57 +00:00
Qt Submodule Update Bot
4bddc8d3f6 Update submodules on 'dev' in qt5
Change-Id: Ic635a1050dd225a105925bfbc006ad933f352c27
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-28 07:28:26 +00:00
Alex Blasche
6a44181e8c Update ldconfig cache once freeopcua has been installed
Change-Id: Id9a2fd6c0f4f426906cf5d553db9559e180b27ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-08-26 12:00:26 +00:00
Timo Aarnipuro
8007941af0 Enable INTEGRITY coin builds
Task-number: QTBUG-61702
Change-Id: If5f10aafc6d2c0853fbc3039aa7368620e04ea20
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 13:55:01 +00:00
Liang Qi
e6da4a6aa5 Update submodules on 'dev' in qt5
Change-Id: I7192cbb513f05320c792a29a598b535bcd469d85
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 11:55:17 +00:00
Liang Qi
ebf8aa15e6 Merge remote-tracking branch 'origin/5.9' into dev
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
2017-08-24 09:12:33 +02: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
Qt Submodule Update Bot
d18d7aaa40 Update submodules on 'dev' in qt5
Change-Id: Ic68d5b4cc41971eb619f2ba32097612aa20df3b1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-29 05:44:26 +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
Simon Hausmann
b229f6d1ea Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I2d5232e2c3a7a8e0d90183b0448ba0ddb5351a29
2017-07-26 15:34:03 +02:00
Maurice Kalinowski
42a802efba Update freeopcua version
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>
2017-07-26 07:45:00 +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