Commit Graph

312 Commits

Author SHA1 Message Date
Liang Qi
63c515a6cb Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.

 Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsaferenderer.yaml

Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
2019-11-28 19:44:30 +01:00
Liang Qi
86b9edca68 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml

Change-Id: I1f6b8dff622c3899b2d655108f638404b3bc2189
2019-11-22 17:26:28 +01:00
Liang Qi
f9183e71bf Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I03ba6455b8789eefb87a844d5fdbe0998cb02337
2019-11-20 07:29:43 +01:00
Jani Heikkinen
5d5ef9c32b Enable dSYM files for release builds in macOS
Same flag is used in windows and linux ones and it seems that is needed
to enable dSYM files for release builds

Task-number: QTBUG-3934
Change-Id: I3f60ea68ba0f4d755e411215efa4cec1d0a46d83
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-15 06:22:55 +02:00
Tor Arne Vestbø
40cca42c39 Use macOS 10.14 to build iOS/tvOS/watchOS
Allows us to (as a follow-up) use Xcode 11.

Change-Id: I799732eee35eea3db83e568d26ded6e7ae1df53d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 20:08:00 +01:00
Simon Hausmann
c85543f88d Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
2019-11-11 10:52:16 +01:00
Liang Qi
ae27f21d26 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml

Change-Id: Id4af2d72bb409b6851758a726677c2f2235fc0af
2019-11-08 09:10:04 +01:00
Heikki Halmet
f1276acf5c Provisioning: Add MSVC 2019 and upgrade MSVC 2017 to the latest version
Under coin/pre-provisioning can be found information what have been
provisioned to tier1 image

Visual studios are updated to versions:

MSVC 2019: version 16.3.1
MSVC 2017: version 15.9.16

Task-number: QTQAINFRA-2875
Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-07 21:59:25 +02:00
Liang Qi
b3f160bc39 Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I61d236e3d97ffd6e1cea460fba3d0eb2dac1d045
2019-11-07 08:08:49 +01:00
Liang Qi
68189ab965 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
2019-11-06 14:19:45 +01:00
Tony Sarajärvi
b34681bf02 Remove macOS 10.12 from CI
Task-number: QTQAINFRA-3342
Change-Id: If617a762b4d65983d2d823ef035d4e5f9e5bc432
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-05 13:56:46 +00:00
Matti Paaso
f178318d2f Add new target for installer framework
Task-number: QTQAINFRA-3284
Change-Id: I3945160f212921b2b30cd39982a808cfc164a1b1
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-11-04 14:46:22 +02:00
Jani Heikkinen
464c4c8147 Drop unnecessary android builds
From 5.14 -> we will have combined android builds for all android
targets. So remove all separate android builds as those are covered by
multi ones.

Task-number: QTQAINFRA-3310
Change-Id: Ia00222cf56e85ed207ad01d5d00a81849196176d
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-10-29 19:46:26 +00:00
Tony Sarajärvi
d406ff6398 Build examples on the no-widgets builds
Task-number: QTQAINFRA-1975
Task-number: QTBUG-63908
Change-Id: I0279fd4ca58ab389855e1152e9a8cee3ac97d502
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-26 14:11:07 +00:00
Simon Hausmann
33d9eb2b99 Work around cmake issue breaking C++ feature detection on Android
As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version
of CMake we're currently using in the CI has an issue detecting clang as
GNU compatible C++ frontend and thus fails to convert the values in the
CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around
this for now as suggested in the upstream ticket. We can remove this
when upgrading to a newer cmake version.

Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-10-17 15:15:09 +00:00
Samuli Piippo
2b58935efd QNX: Use extprefix for the host path
Use extprefix instead of prefix, so that the target deployment
path won't contain host paths. Especially needed to avoid Windows
host paths on target. Prefix will default to /usr/local/Qt-x.x.x

Task-number: COIN-48
Change-Id: Ie888dace694294b72a32913b65a191b4bcb78371
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
2019-10-16 10:02:09 +03:00
Toni Saario
9ee61892d0 Add platform_configurations for StaticHostOnly targets
Configuring modules in specific files removes their dependency for
coin creating their configurations.

Task-number: COIN-259
Task-number: QTBUG-78942
Change-Id: I8f2a9a5672ca2261c8949baf49f2d0d093bf1c5b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-10-15 13:40:58 +03:00
Liang Qi
0c687679c7 platform_configs: add Android arm64 build on RHEL 7.6 host
* install vcpkg and for android
* a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506

Task-number: QTBUG-78945
Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-11 18:56:33 +00:00
Simon Hausmann
97f5eca381 Add separate debug info for MinGW packaging release builds
Since we stopped the separate debug builds for MinGW in 5.14, we should
include debug symbols for the release libraries as separate files to
give our users something.

Change-Id: Idf8a6748056cd9da03eddc37aebd77b4c190aedf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-10-10 21:39:29 +02:00
Liang Qi
9e3b3c838c platform_configs: add a RHEL 7.6 build
A preparing for having android build later.

* install gcc 7.x
* install git 2.x
* install a few other dependencies

Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-10 05:34:27 +00:00
Gatis Paeglis
1430513438 platform_configs: add -bundled-xcb-xinput to RHEL-7.6:Packaging
All libs, expect xcb-xinput have been dropped from 3rd party sources
in qtbase. When building default binaries for releases we used to have
"qt-xcb" switch to reduce dynamic depenendies of the binary. We still
need to do that for xcb-xinput (via -bundled-xcb-xinput) as this library
is not available on some of the supported distributions.

Change-Id: Iece12bc38978ddb66f84928f661924f076c3647e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-08 10:18:55 +02:00
Liang Qi
ac2054a633 Add macOS 10.14 to the CI again
Task-number: QTQAINFRA-2938
Change-Id: Idd331fcb29752386b95463de8bdaeb0dd6b0ac08
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-06 21:49:35 +02:00
Liang Qi
3813848266 Merge "Merge remote-tracking branch 'origin/5.15' into dev" 2019-10-06 21:49:30 +02:00
Simon Hausmann
68fdf9c0be Remove WinRT from the configurations for qtconnectivity
WinRT was tested by default and removed in commit
5677a43a25 globally.

Change-Id: I4878266cd25a05b74a4a3427840c3aaef0029032
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-10-04 17:29:31 +00:00
Liang Qi
44cf8f65a2 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml

Change-Id: I6adccbdcd3a4b794380a2e202e567146e663c15f
2019-10-04 12:55:57 +02:00
Liang Qi
2d577a83ec Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml

Change-Id: I34cf4fb6818c17872e55f36149e8f91871d2aea1
2019-10-03 14:40:41 +02:00
Liang Qi
29befcc995 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml

Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
2019-10-01 11:37:07 +02:00
Alexandru Croitor
cba04eb531 Build examples on at least one configuration
Ubuntu Linux in this case.

Change-Id: Ic17b3f4880105e639340ffc07c52de27245612d7
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-30 09:14:06 +00:00
Liang Qi
076fb6bd6d Merge remote-tracking branch 'origin/5.13.1' into 5.13
Conflicts:
	coin/platform_configs/qt5.yaml

Change-Id: Iaeec542042807c00e4c2597b546b00ce0f267b48
2019-09-27 07:27:28 +02:00
Liang Qi
1605059e87 platform_configs: remove CMAKE_VERBOSE_MAKEFILE option
which is not in use when ninja got selected.

Change-Id: I1841471dee0f58e4a54cd05f33f4ba7c3a1a8251
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-09-25 10:54:34 +00:00
Jani Heikkinen
2cec2c5f8c Add build for combined android targets
From 5.14 -> android builds are done by default at one go. Add new builds
for doing that.

Removing old, separate builds will be removed in a follow-up patch to
give time for packaging to adapt that new system

Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-09-24 12:08:17 +03:00
Liang Qi
44073f5563 Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt

Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
2019-09-23 16:38:06 +02:00
Liang Qi
14d2852597 Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
	.gitmodules
		Ignore qtquick3d for now.
	coin/platform_configs/default.txt
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.txt
	coin/platform_configs/qtbase.yaml
		We use yaml files for configurations now.
		Adjust the configurations for Qt6 as it was
		    done before in the .txt files.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
2019-09-13 14:04:47 +02:00
Liang Qi
01ad208333 Merge remote-tracking branch 'origin/5.13' into 5.14
This change partially reverts 24f0367a60.

 Conflicts:
	coin/platform_configs/default.yaml
		SLES 12 got removed temporarily.

Task-number: QTQAINFRA-2851
Change-Id: Ib12a6e5ced3c89a5c8c9c2b1548a1c9d23d159d9
2019-09-13 13:04:25 +02:00
Heikki Halmet
fa03dbce1f Platform configurations: Move Android_ANY (clang-x86) to default
Arm targets from default change places with clang-x86 from qt5

Task-number: QTQAINFRA-3153
Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-12 20:51:28 +03:00
Liang Qi
677412dcbe Move the developer build from static suse to ubuntu
Because we don't run tests on static build.

Change-Id: I10c7851ecebcfa3691690c6bc26a352fd5799965
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-11 05:56:37 +00:00
Assam Boudjelthia
d8a384f03f Provisioning: Use correct sysroot path for QEMU armv7 in qtdeclarative
Task-number: QTQAINFRA-2808
Change-Id: Ia0caf7003a5bd67dc220f0a3a1da06646ca6b657
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-10 10:49:01 +03:00
Liang Qi
8c00a4f011 Add webAssembly build for windows again
This reverts commit 9a8fb868ec
partially.

See also 38e416be66.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Change-Id: I6a63c2c437bd1568d88ffae0b565b99c15188770
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 06:13:18 +02:00
Liang Qi
1bb7d2d0c9 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iffcf9b199df17a50acf03e29b9deae033396dfcb
2019-09-09 20:57:09 +02:00
Tuomas Heimonen
d4e3d3cac3 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-opengl' to remove xcb from static build
Add build flag '-no-vulkan' to disable vulkan

Task-number: QSR-517
Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-09 16:53:05 +03:00
Assam Boudjelthia
d581d86fc5 Provisioning: update QEMU toolchains
* Update QEMU toolchains to Yocto thud(2.6) release(DC Qt 5.13.0) with
GCC 8.2.0.
* Suppress QEMU "Unsupported syscall" and "Unsupported ioctl" logs,
set environment variable QEMU_SYSCALL_DEBUG to show them.

Task-number: QTQAINFRA-2808
Change-Id: I987353b0f3aff87a02ea3bf96ace8de32d6f557b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-07 07:09:24 +00:00
Tuomas Heimonen
be97b9ad72 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-xcb' to remove xcb from static build

Task-number: QSR-517
Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-06 07:11:51 +03:00
Tor Arne Vestbø
14c31bf8db Remove un-needed configure arguments for Apple OSes
Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-09-05 23:40:29 +02:00
Liang Qi
f9801f90f6 Merge remote-tracking branch 'origin/5.13.1' into 5.14
Conflicts:
	coin/platform_configs/qt5.yaml
		5.14 is using NDK r20 for android.

Change-Id: I483a628abd154c40937a44e196643a2be2552987
Fixes: QTBUG-77999
2019-09-04 09:41:19 +02:00
Tuomas Heimonen
5035d38525 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-qpa offscreen' to remove dependency to xcb libraries

Task-number: QSR-510
Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-03 21:37:50 +03:00
Tuomas Heimonen
5752c0d4bc Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-icu' to remove dependency to icu libraries

Task-number: QSR-499
Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-08-30 13:34:06 +03:00
Liang Qi
f58935ebea Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/platform_configs/default.yaml
	coin/provisioning/common/linux/disable-ntp_linux.sh
	coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh
	coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
		emsdk.sh was moved from linux to unix, see
		38e416be66

Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
2019-08-28 20:28:11 +02:00
Tuomas Heimonen
163bd8006e Update Saferenderer static builds
qtci-windows-10-x86_64-10 static build: remove flag '-developer-build'
qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig'
and '-qt-freetype', remove flag '-developer-build'

Task-number: QSR-491
Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-08-28 09:53:18 +00:00
Gatis Paeglis
8f87412708 platform_configs: replace -qt-xcb with -xcb
... as we are removing -qt-xcb switch from qtbase as part of
stopping to bundle xcb sources.

Change-Id: I33d58b78a1d7f53d5941ebda7131bf35a71cc8e6
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-08-26 23:07:06 +02:00
Tuomas Heimonen
11d6401d98 Update Saferenderer static builds
DisableTests on qtci-windows-10-x86_64-10
Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64

Task-number: QSR-432
Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-08-26 20:47:05 +03:00