Commit Graph

132 Commits

Author SHA1 Message Date
Liang Qi
e866953948 Merge remote-tracking branch 'origin/5.11.2' into 5.11
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I430b2b99d1ed463d1750c6f1a5955bc0742f4b35
2018-09-10 10:12:36 +02:00
Antti Kokko
6a919fb8f5 Use MinGW73 for building Qt3D runtime QNX targets
Change-Id: I0fc650345dcffe8840f440db74cf4d9d48465bf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-09-06 11:41:52 +00:00
Antti Kokko
f70c304b5e Add qt3d-runtime targets
Task-number: QT3DS-2126
Change-Id: Ibce83cbd513bc0083ac149ed453fc9eb217c1d7a
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2018-08-30 08:35:36 +00:00
Liang Qi
2b2a639fb9 Unify the iOS/tvOS/watchOS builds in default.txt
Then we can save more virtual machines.

DebugAndRelease V.S. Release(build time):

qtbase
* iOS static: 14min, 57s : 11min, 35s
* tvOS: 17min, 24s : 9min, 38s
* watchOS: 16min, 36s : 9min, 46s

The longest ones, some win10 builds, are about 40 min. And the
longest ones for tests, are about 1 and half hours.

qtdeclarative
* iOS static: 19min, 10s : 12min, 19s
* tvOS: 20min, 35s : 12min, 55s
* watchOS: 15min, 17s : 9min, 59s

qtwebengine
* iOS static: 12min, 48s : 4min, 14s
* tvOS: 6min, 6s : 4min, 10s
* watchOS: 6min, 21s : 6min, 13s

Change-Id: I51618683de8ed0826120b8baaef1e2e11473283a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-28 19:02:05 +00:00
Simon Hausmann
1e9fb7f9d9 Prospective fix for build of qttools on Windows with QNX target
This modules contains qdoc as a host build tool, which needs to be built
with MinGW 7.3 as host compiler in order for the libclang linkage to
succeed. That linkage is forced via QDOC_USE_STATIC_LIBCLANG, which is
set on the Windows 10 machine.

Task-number: QTBUG-69793
Change-Id: I2f0ce81c58ae049d9d59559dfe4f457d082cc98d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-08-23 09:28:56 +00:00
Simo Fält
eb1ca70def Provisioning: Add 64 bit Mingw to coin as packaging target
Change will provision DirectX SDK with enabler DotNetFramework also, so
that configure for MinGW will detect ANGLE correctly. The DirectX
headers and libs will be in two location, while those are installed
with MSVC also.

Task-number: QTBUG-35288
Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-06 08:37:51 +00:00
Samuli Piippo
1c8ff381be Change QNX7 x86 release builds to x86_64
Task-number: QTBUG-67746
Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-15 06:13:26 +00:00
Joni Jantti
9af755a79e Add VC build tools to Windows 10 x86 template
These tools were missing from the installation.

Change-Id: I627b28a6f9373df708952e22a7f404b8dbce6239
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-06 11:02:51 +00:00
Joni Jantti
9e74a1e5b7 Add a clean installed Win10_x86 for RTA
Task-number: QTQAINFRA-1842
Change-Id: I0334d74055690c7f850fd105fe008d11a8e57b8c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-05 13:10:26 +00:00
Miikka Heikkinen
9dd5f6d861 Add SeparateDebugInfo for linux release
Task-number: QTQAINFRA-1688
Change-Id: I3557ac1e2bb6964278f381736f87e6fd3304744b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-28 14:24:53 +00:00
Matti Paaso
b59f4207a3 Add Windows 8.1 target for RTA
Change-Id: Ifd055590bada66f7437af0b4de4a8549440952ae
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:20 +00:00
Tony Sarajärvi
b85b272c26 Move MSVC2017 x86 builds to 64bit host OS
Change-Id: I7544c12086ef8a437bca575dfce7de44ec9938a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:40 +00:00
Matti Paaso
884490eaae Add RTA targets
Release Test Automation tests are ran also in additional targets
compared to qt5 targets.

Change-Id: I72ca86f875920ec266e0e6b7ea3fee026eaa1cfe
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-20 10:47:12 +00:00
Jake Petroules
355252621c Remove macOS 10.10 from CI for Qt 5.11
As agreed, this version will not be supported any longer.

Change-Id: I37d9d9d9e32b5d17dbf0f80a6c42a8e233bcc446
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-02-10 19:15:51 +00:00
Allan Sandfeld Jensen
18b5dbf7df Add a MSVC2017 platform to the default tested
Is needed for qtwebkit and qtwebengine testing and added in dev, where
MSVC2013 was removed to not add additional pressure on the CI.

Task-number: QTBUG-65830
Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-26 15:49:50 +00:00
Samuli Piippo
953dc011b2 Enable ARM64 build for QNX7
Change-Id: Ic30f4032c73ec16a9f1b93b3afee1e9812074bb7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-24 10:24:13 +00:00
Frederik Gladhorn
052b4b5844 Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
2018-01-22 12:19:10 +01:00
Liang Qi
45528e6874 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I0fdced87d2064e8459fa0b9c4e16a53c1f44ac0a
2018-01-19 09:56:46 +01:00
Liang Qi
57ba8230bd Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: I1c5c5e6e938f33dd8b0b9c40e64d509eeec25774
2018-01-18 23:41:16 +01:00
Jani Heikkinen
2348ead529 Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries"
Now debug symbols are added in qtlibs as well and library size
is huge. We need additional 'separate_debug_info' flag in
addition to this but currently there isn't support for it in
coin. That's why we need to revert this change until coin has
full support for this.

This reverts commit b0b6b05b34.

Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2018-01-18 05:09:07 +00:00
Liang Qi
1c7ba877cc Move QNX 7 arm build from qt5 to default
QNX 6.6 builds were removed. We need to check QNX in submodules
build.

This change amends 357de3ea13.

Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-14 08:59:49 +00:00
Liang Qi
c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
2018-01-12 21:13:56 +01:00
Liang Qi
19872ea843 Merge remote-tracking branch 'origin/5.9' into 5.10
Fixed up provisioning script locations after the reshuffeling into
common/platform folders.

Change-Id: Ia0b7d076e475ccc207f2955572fb9ab4171e5d9d
2018-01-11 15:13:13 +01:00
Konstantin Tokarev
ebe2b86fd0 Remove 'Packaging' flag from QtWebKit MSVC2017/x86
Qt doesn't provide binaries for this platform.

Change-Id: Iab30435bb480ee898c2409f87facabb26fce9421
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-10 10:35:59 +00:00
Jani Heikkinen
de5d8f3b4f Adjust QNX packaging builds for Qt 5.11
- Add missing 'Packaging' flag for linux and windows QNX builds
- Remove unnecessary 'Packaging' flag from mac QNX build

Change-Id: Ie4c49b9bd93f67f6a2dbbdece99da8c8f5fb3bef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-01-09 15:56:32 +00:00
Liang Qi
2a39f8e5fe Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7119e6e1853b0eef2b695fb8165518e90b18d250
2018-01-06 09:08:20 +01:00
Tony Sarajärvi
7a37b90702 Drop builds done with VS2013
Task-number: QTQAINFRA-1390
Change-Id: Id3de3706466508cdbfc586b2a39d96083e8434e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-05 20:43:53 +00:00
Jake Petroules
d3c2de907d Add Apple tvOS and Apple watchOS configs for all modules
...not just qt5. This will eliminate the semi-frequent integration
failures in qt5 submodules updates.

Change-Id: I99a4eb1cf41005adcfd12e385b663a5d8adbc628
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-05 04:15:19 +00:00
Tony Sarajärvi
da3d21c0e6 Fix the Tier1 image that qtbase builds qemu builds with
Commit fcc0feaacb forgot to
update the Tier1 image in qtbase.txt. It only updated
default.txt and qtdeclarative.txt. Most likely because
qtbase.txt was added after initial changes were made
and not caught in rebase.

Task-number: QTQAINFRA-1574
Change-Id: If5da006172037c27dec5b3ae0b14330bc6f0149f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-02 11:23:38 +00:00
Lars Knoll
7a96b8dfd4 Revert "Temporarily remove two platforms from the qt5.git build"
This re-enables all platforms we should be testing on, after
having resolved the deadlock between qtbase and declarative.

This reverts commit 62efcd0c0a.

Change-Id: I2bcc34ad2d00036cc8ed37badbca67d4e68f5eac
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-30 08:08:33 +00:00
Joni Jäntti
fcc0feaacb Add clean Ubuntu 16.04 provisioning
Currently Ubuntu 16.04 template has stuff installed on its tier 1. We
want to have a clean installed tier 1 and install everything on it
during provisioning. This will save some disk space on our hosts.

Task-number: QTQAINFRA-1574
Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-29 13:16:32 +00:00
Lars Knoll
62efcd0c0a Temporarily remove two platforms from the qt5.git build
This is required to get a qt5.git update through, where we're having
a catch22 problem. Current qtbase in qt5.git gives compile errors on
some of the tested platforms, while qtdeclarative has test failures
due to (correct) changes in qtbase. So we can't merge the fix for
declarative without updating qt5.git, and we can't update qt5.git
without having that fix merged.

Change-Id: I87f79f6312a6ee2226aeb7b6868fd280ab087bcc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-29 11:40:12 +00:00
Tony Sarajärvi
357de3ea13 Drop QNX 6.6.0 verification from the CI
Task-number: QTQAINFRA-1378
Change-Id: Icc5fb21b6430c916ceecb8d5a504d40938931b06
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 11:29:31 +00:00
Liang Qi
1bba397539 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh

Change-Id: I5aaf8fa93f7a9f06e30b9730703e8d1e018cb1f7
2017-12-22 21:37:24 +01:00
Jani Heikkinen
21cbacf4b4 Remove 'Packaging' flag from builds we don't need it
We don't offer binaries for INTEGRITY, MSVC2013 32 bit or MSVC2017 32bit
so we don't need 'packaging' flag there either

Task-number: QTBUG-65324
Change-Id: If9e8fdebab44fcafde9b4da893be6f79f6287aac
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2017-12-22 05:21:20 +00:00
Liang Qi
730e2c9b0b Revert "Temporarily disable android build on macOS 10.12"
Bring android build on macOS back.

This reverts commit b6249e89fa.

Task-number: QTQAINFRA-1660
Change-Id: I510894cf6bdc7089fea140e3702e5246a6617787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-21 16:55:12 +00:00
Liang Qi
b6249e89fa Temporarily disable android build on macOS 10.12
Need to be re-enabled when correct fix landed.

Task-number: QTQAINFRA-1660
Change-Id: Ifefb019016322ebf2e7c4ec9320e58555c6918e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 06:39:05 +00:00
Tony Sarajärvi
df7255ce44 Swap ICC builds to use system's SQLite library
Task-number: QTBUG-64650
Change-Id: I2c692ae04f0cc02a5fecb12e3a7b905ee89b1af9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2017-12-14 17:59:31 +00:00
Liang Qi
def11da274 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
2017-12-14 11:49:07 +01:00
Liang Qi
475fc2c2ad Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.gitmodules

Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
2017-12-13 23:28:56 +01:00
Jani Heikkinen
b0b6b05b34 Add 'ForceDebugInfo' -flag to linux desktop binaries
Add 'ForceDebugInfo' for RHEL 7.4 as well

Task-number: QTBUG-3934
Change-Id: I121c109f755c1b65bc0a59fc4edcb0a03f870d54
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2017-12-13 19:41:28 +00:00
Liang Qi
eccfaf1f50 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ica3e7340f572140020318c6e22397fad393f9b15
2017-12-11 12:11:51 +01:00
Liang Qi
91df8a3a8f Fix syntax error - not use comma in platform_configs
ammends d9f2fe1b7f

Task-number: QTQAINFRA-1636
Change-Id: I92d0af1c62f4c6da92fce1a00d7a2b60055ce8dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-11 10:00:50 +00:00
Liang Qi
c2c45640e0 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	coin/platform_configs/qt5.txt
	coin/provisioning/common/install-commandlinetools.sh
	coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh

Change-Id: I3b20cda2b35412fd708295e4f9e32cd2d7d638fb
2017-12-09 23:09:15 +01:00
Liang Qi
7d04dc1a29 Move INTEGRITY build from qt5 to default
Many failures in qtbase on INTEGRITY happened recently.

Change-Id: Ic55259e694961a53199d30f095159728207f8824
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:59 +00:00
Liang Qi
d9f2fe1b7f Add b2qt developer build for qtbase
Because we had enabled this for qtdeclarative before.

Change-Id: I1efd438ebf51b2e632d3f8f39bd707e7eb5a282e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-08 20:05:56 +00:00
Tony Sarajärvi
92a7d95947 Fix indentation in platform configurations
Change-Id: Id4a7bec02b0ee1156e80667538a29ca2baf4cfed
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2017-11-30 05:00:39 +00:00
Liang Qi
062b29b311 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
2017-11-16 23:14:25 +01:00
Joni Jäntti
841cf6893a Make QtWebKit builds use vanilla Win 10 x64 template
QtWebKit build targets are currently using the old non-vanilla template
for Windows 10 x64.

Change-Id: I67c536bc86939508cb8056ac3b7372096274fa69
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-11-11 22:06:52 +00:00
Liang Qi
90272a84ae Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.

 Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtdeclarative.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh

Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
2017-11-09 14:05:56 +01:00