Commit Graph

4592 Commits

Author SHA1 Message Date
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
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
Dominik Holland
a765838889 Fix the python3 packages on openSUSE 42.1
Change-Id: Ie445949ac90bf6a9ce7b519bbe3c32d2d1e1a69b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-13 16:39:12 +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
Oliver Wolff
0787472145 Add winrtrunner to common tools on Windows 10 machines
winrtrunner is needed for running auto tests on winrt. As the tool
resides in qttools and not qtbase and it not changed often, it was
decided to handle it similar to jom and see it as an external tool.

Change-Id: I9636962df51f98bef6aad3e340c565f50e393949
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-06-12 05:43:15 +00:00
Qt Submodule Update Bot
026f813fcb Update submodules on 'dev' in qt5
Change-Id: I23fe8d00027c73dd5ea774589853a4e22c70e402
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-12 05:43:12 +00: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
Qt Submodule Update Bot
9101ac782f Update submodules on 'dev' in qt5
Change-Id: I5f4b2743d35576c0b6df2ee62ec404d337974c3c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-06-07 05:06:50 +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