Commit Graph

1801 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Tony Sarajärvi
0dd6023684 Remove provisioning scripts for platforms not supported anymore
Change-Id: I8c3685aaf51005f58ba84f695879f82e32a4f689
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-14 07:43:39 +00:00
Qt Submodule Update Bot
90cee99617 Update submodules on '5.9' in qt5
Change-Id: Ibea2cde30fc92cc089622379068af09e453d8504
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-14 07:42:56 +00:00
Tony Sarajärvi
52bfe2a9a8 Enable autotest for macOS 10.12
Task-number: QTQAINFRA-1093
Change-Id: I21e715b10593d0a9c55b2324c6af8e4bffca0b72
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-14 07:42:53 +00:00
Simon Hausmann
20113e4872 Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: I1709ddd14bf27186a8968ce073cf22e7903ff798
2017-06-12 21:36:03 +02:00
Kai Koehne
9b0e908aca Build examples with MSVC 2015 instead of MSVC 2013
Qt WebEngine does not build with MSVC 2013 anymore, hence the examples
from this module weren't tested at all.

The 2015 configuration also places the Qt symbols in a namespace, so
this adds additional coverage.

Change-Id: I395866e8435fbcba33a1b3b4a4a5ccfe82ebad15
Task-number: QTQAINFRA-1271
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:22 +00:00
Friedemann Kleint
eb58b173e1 Enforce MinGW developer build
MinGW is very sensitive to inlining / export errors, so having a
developer build check is valuable. Add a MinGW developer build
executing tests to increase coverage and turn off testing for the
packaging build in return.

Change-Id: Ia4bdacc9952c7a568ac9d4105818eb926c88e6ca
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:13 +00:00
Qt Submodule Update Bot
967ba102f3 Update submodules on '5.9' in qt5
Change-Id: I2cfafe4529e2eb9f3c18bdc79365f0f306d42891
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 18:19:06 +00:00
Oswald Buddenhagen
9bb17a6f88 Adjust submodule branches
Change-Id: Ib2a7d9a96a8c992527db170276cd0e34b85d1dc2
2017-06-12 12:32:53 +02:00
Simon Hausmann
5bc43f0cc3 Fix Postgresql and Mysql environment variables
The correct paths to the headers are

    c:\utils\postgresql[x86]\pgsql\include

not

    c:\utils\postgresql[x86]\pgsql\pgsql\include

Same for libs.

Regression introduced by commit ce47238ed9
but only noticed in the 5.9 branch.

Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-12 04:43:24 +00:00
Sami Nurmenniemi
7456e028a7 Enable CI tests for Boot2Qt
Task-number: QTBUG-60261
Change-Id: I296cf7f9afc15aebf1d2006c51023cb6ac3b0c3b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-09 05:43:48 +00:00
Simon Hausmann
0358b6d28c Remove QNX Windows builds
We can't get those to work with the faster KVM based VMs, so disable
these builds for the time being.

Task-number: QTQAINFRA-1208
Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-06-07 18:10:08 +00:00
Liang Qi
9bb96b31a0 Update submodules on '5.9' in qt5
Change-Id: Ie82dec6200b3b2a9633feb2dabec9ac27afbcaf8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-07 05:05:03 +00:00
Simon Hausmann
303d617329 Disable tests on macOS 10.10
We cannot run graphical tests reliably on 10.10 anymore with the new
virtualization without vmware. As outlined in the referenced task, we
occasionally get the Window Server locking up. So for the time being,
this change disables testing on 10.10.

Task-number: QTQAINFRA-1198
Change-Id: I020d4a298562554838cd7e898df52438db536d7a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2017-06-07 04:16:32 +00:00
Simon Hausmann
35057fe4b2 Clean up windows cleanup script
* There's no need to have a numbered prefix in the common directory
* Instead of deleting directories trees worth several gigabytes of data,
  just rename the directory. The underlying storage system is
  copy-on-write and so deleting the files produces more data than just
  moving the directory out of the way. Deleting the files does not
  actually free up any physical disk space.

Change-Id: I6de02d56f3485651726ea11183ce7571d5b61520
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-06 20:15:40 +00:00
Simon Hausmann
038d263081 Speed up Windows installation of cmake, python, opengl, mysys and Android
We're better off copying off the internal server using CIFS than using
PowerShell's incredibly slow Invoke-WebRequest.

Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-06-06 20:15:34 +00:00
Simon Hausmann
999b5f5dd7 Speed up Visual Studio update installation
We have a prepared package on the internal server that has everything
necessary included. This way we do not have to download the actual
update content from the internet.

Change-Id: Ie4cb3116a4f91a47df5be1c2b2e473d7ddec9a78
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2017-06-06 20:15:31 +00:00
Simon Hausmann
ce47238ed9 Improve Postgresql installation on Windows
Similar to the mysql change (parent commit) it's faster to rename any
older artifacts and install only what we need. This also generalizes the
zip archive extraction code for "dev" packages.

Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-06 20:15:28 +00:00
Simon Hausmann
982659b081 Improve mysql installation
* Instead of deleting the files from a previous installation, which will
  not actually release any disk space but just make the qcow2 file
  larger, let's just rename the directory the old files are in.
  That is a significantly faster operation.
* When extracting the zip archive, only extract what we need for Qt:
  Libraries, binaries and headers. We can skip the installation of
  several thousand documentation files for example, which takes a long
  time.
* Instead of downloading the zip archive via PowerShell's
  Invoke-WebRequest we can get the data much faster using CopyItem off
  the CIFS share. As a bonus this is also more robust against download
  failures.

Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-06-06 20:15:09 +00:00
Tony Sarajärvi
ba1a8d6216 Provision macOS disable screensaver in current session
Task-number: QTQAINFRA-1244
Change-Id: I3a27d8cdee8cd7b22d86116d58009e952ab536ea
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-05 03:32:31 +00:00
Jani Heikkinen
5be9b3d2be Add missing ForceDebugInfo -flag for winRT x86_64 builds
Task-number: QTQAINFRA-1233
Change-Id: I5fadf9a71e5835b852849fbee1f7021864044f25
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-06-04 19:55:21 +00:00
Akseli Salovaara
8df3b0c7ea Build Windows 10 MSVC2015 x86 on Windows 10 x64 host
Changing MSVC 2015 integration host from 32 bit to 64 bit machine
enables CI for QtWebEngine 32 bit Windows builds.

Change-Id: I3d30df90fa7d92c603a2e91dd528d817e682c214
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-04 19:55:18 +00:00
Thiago Macieira
60fb73a1eb qtremoteobjects has QML plugins
Change-Id: Ia3e896da908f42939148fffd14c47ef303f5d0e7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
2017-06-04 17:03:03 +00:00
Qt Submodule Update Bot
e78c03197a Update submodules on '5.6' in qt5
Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-03 21:26:37 +00:00
Qt Submodule Update Bot
c5c23f3eba Update submodules on '5.6' in qt5
Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-05-29 07:55:23 +00:00
Liang Qi
1f15ce005f Merge remote-tracking branch 'origin/5.9.0' into 5.9
Conflicts:
	.gitmodules

Change-Id: Ifa5edde4cfd68df959fabb6a61595d8c1b28b099
2017-05-26 10:29:43 +02:00
Jason Erb
613242b2bf Add *.pro.user* to .gitignore
Task-number: QTBUG-60767
Change-Id: Id81504b35dc8d3ef7eba6ada5baaefe5e6d9f106
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Mandeep Sandhu <mandeepsandhu.chd@gmail.com>
2017-05-25 21:34:29 +00:00
Oswald Buddenhagen
5236e08cd4 make -skip work with configure -redo
the handling of -skip happens outside the usual argument handling, so we
need to handle -redo manually as well.

Change-Id: I7dcdf729bd9db2ff2ac8dc08bac71462bf30814b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-05-25 21:34:26 +00:00