Commit Graph

1858 Commits

Author SHA1 Message Date
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
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
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
Liang Qi
65eb6e74f8 Update qtwebengine and qt3d only
Task-number: QTBUG-61693
Task-number: QTBUG-61983
Change-Id: I703ea440ae1b572ae97c4c6616f63b5524718931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-18 04:16:45 +00:00
Simon Hausmann
d615b4a99f Merge remote-tracking branch 'origin/5.9' into dev
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
2017-07-14 07:24:32 +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
Simo Fält
577140a728 Provision 7z
macOS 10.11 tier1 template is missing 7z.

Change-Id: I9e1ade8605b5e6f389a2cd76340070070a7c637b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-08 07:23:03 +00:00
Qt Submodule Update Bot
2f03b7faac Update submodules on '5.9' in qt5
Change-Id: I15484289efb35a8b8763379466c884f32f2f9cf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-07-08 07:22:54 +00:00
Liang Qi
bded0e1bbc Update qtqa only
Change-Id: I326c5a081af3bdd5e11aff5316c604a64db94a97
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-07 22:02:45 +00:00
Liang Qi
cdbccd5a12 Update submodules on 'dev' in qt5
Change-Id: I3aca18dc902cd9499c5977e606cd256082144695
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-07 21:33:24 +00:00
Liang Qi
82bdc55bc3 Update submodules on 'dev' in qt5
Change-Id: I0c3b28b0ecfefca4211f4944a059e383173415d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-06 06:17:22 +00:00
Qt Submodule Update Bot
3c1f21253d Update submodules on '5.9' in qt5
Change-Id: I611bb70dfb5a51adfce657491820735f13aec274
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-06 05:43:30 +00:00
Qt Submodule Update Bot
7e67de9700 Update submodules on '5.6' in qt5
Change-Id: I8701d1b838be1730ccaaa2835c47e0389bb4bcc3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-07-06 04:16:19 +00:00
Liang Qi
e70352fdf7 Merge remote-tracking branch 'origin/5.9.1' into 5.9
Change-Id: I45fa799354b107ba95b55063f6b81f4dca4b8bb5
2017-07-04 14:18:30 +02:00
Liang Qi
cc549c2444 Update qtqa only
Change-Id: I6ef90bb4ce03188a3bcc6e22bbf1e9204e763690
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-04 11:51:53 +00:00
Qt Submodule Update Bot
2176de2286 Update submodules on '5.6' in qt5
Change-Id: I5f1e4425bf98dd9fba31f21392dfec9d991ebf7d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-04 08:02:02 +00:00
Qt Submodule Update Bot
6711742b8c Update submodules on '5.9' in qt5
Change-Id: I599d90ba87636b0e738d2263ddfd036f458ae8fe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-04 05:05:41 +00:00
Liang Qi
744634e97f Update qtwebkit only
Change-Id: I767b48af8cf41355cc984f8d884b1bc042cae4bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-07-03 18:04:50 +00:00
Konstantin Tokarev
331cf52ff7 Provisioning: Install Ninja on windows hosts used to build cmake-based QtWebKit
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>
2017-07-03 07:22:38 +00:00
Qt Submodule Update Bot
252cbbc4b8 Update submodules on '5.6' in qt5
Change-Id: I077670116fb8fa2fdce44a0260aacfedf16234c6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-30 04:53:27 +00:00
Jani Heikkinen
f3a2e06e60 Switch qtspeech & qtnetworkauth from tp to addon
qtspeech and qtnetworkauth aren't technology preview modules anymore
from Qt 5.10 ->

Task-number: QTBUG-61436
Change-Id: I1a88f554498461a81ee80f435fccad7d0e542abf
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-29 21:16:52 +00:00
Liang Qi
69188e280c Update submodules on 'dev' in qt5
Change-Id: I40a221e14a1d308619e1e382b08ae16240b81ead
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-29 21:16:49 +00:00
Qt Submodule Update Bot
477736dff0 Update submodules on '5.9' in qt5
Change-Id: Ia1e8d5681b65e37882b61f1a00f9f6acc88f81b9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-29 10:13:23 +00:00
Qt Submodule Update Bot
d07943b322 Update submodules on '5.9.1' in qt5
Change-Id: I4d1313a38b7f2296db43badf8e8906be9fa6b3d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
v5.9.1
2017-06-28 19:36:22 +00:00
Jesus Fernandez
e6d42ad390 Add qtwebglplugin
Task-number: QTBUG-61443
Change-Id: I0a139c68c41cfa11d110fab1d7c97276c4d022a0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-06-28 15:34:08 +00:00
Liang Qi
b99923d6ee Update qtdeclarative only
Change-Id: Id092226dfa273fff8459b6a256ce5e5e87c364ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-26 22:27:57 +00:00
Dominik Holland
1859f9b26c Download and install vc_redist 2015 on windows 7 and 8
This is a dependency of the python3 packages for windows

Change-Id: I6f45dcb1d64f43dedd883d33fdc85038c24fc501
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-26 08:12:40 +00:00
Qt Submodule Update Bot
fd58c39c31 Update submodules on '5.6' in qt5
Change-Id: I0c2e8c0756239c679a2442c164c1eafa5b21f84e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-26 05:56:04 +00:00
Qt Submodule Update Bot
27761dc945 Update submodules on '5.9' in qt5
Change-Id: Ic665ad45eee9ee847438921bc663e9374c94a59b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-25 08:05:18 +00:00
Liang Qi
22522f5190 Update submodules on '5.9' in qt5
Change-Id: I228229c5b9afaa6e3a34ba33d7b3cbcc17695629
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-24 19:58:06 +00:00
Qt Submodule Update Bot
0f33bbfccc Update submodules on '5.9.1' in qt5
Change-Id: Iab5c3a27dbaab7804978afb0bde341155903c141
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-24 09:15:35 +00:00
Simon Hausmann
8318aa7f13 Fix builds with examples and namespaces and tests in qtbase
Manually bump declarative include a sha1 that'll unbreak the build.
Also bump qtbase to latest 5.9.1 to include the blacklisting of
tst_qudpsocket::linkLocalIPv6.

Change-Id: If5739bc170bc7f2e45d8c5e785bcad6eb15fddcd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-23 06:08:55 +00:00
Simon Hausmann
2c4b06a13d Centralize Mesa LLVMPipe installation on Windows
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>
2017-06-20 04:44:49 +00:00
Oswald Buddenhagen
3dfaaaa804 Merge remote-tracking branch 'origin/5.9' into 5.9.1
Change-Id: I4cd60a86dc6538d94163702e9635a58157c599b6
2017-06-19 08:25:51 +02:00
Qt Submodule Update Bot
d4393574f3 Update submodules on '5.9' in qt5
Change-Id: Idfe407e44ed4a659615a711c34570cd99096a502
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-18 19:56:02 +00:00
Liang Qi
9781ab9119 Update submodules on '5.9' in qt5
Change-Id: If5a5489690a896422cdc183b520635675d76118b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-17 22:04:40 +00:00
Qt Submodule Update Bot
816f1c5512 Update submodules on '5.6' in qt5
Change-Id: I6c6a2f3d51f4899809810123112081a47f054358
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-17 16:39:34 +00:00