Commit Graph

1819 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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