Commit Graph

316 Commits

Author SHA1 Message Date
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
Tony Sarajärvi
0414df3e2e Build MIPS64 with b2qt toolchain - again
This configuration verifies big endian builds.

The build was accidentally removed in merge
a94696ccd5.

See also 9b84c7135b.

Task-number: QTQAINFRA-2492
Change-Id: I2616f918591758b4cfee244a0a5414a61322f7d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-08-22 11:30:56 +00:00
BogDan Vatra
9dd4451234 Android: Update Android NDK to version r20
Fixes: QTQAINFRA-3152
Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-08-22 06:55:47 +02:00
Liang Qi
9a8fb868ec Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26.

 Conflicts:
        coin/platform_configs/default.yaml
                Temporarily remove the -no-opengl build.
        coin/platform_configs/meta-boot2qt.yaml
        coin/platform_configs/qt5.yaml
                Temporarily remove the webassembly build on windows.
        coin/platform_configs/qtwebkit.yaml

Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
2019-08-20 14:10:00 +02:00
Tuomas Heimonen
9d69ef09e3 Add Packaging to Saferenderer static builds
Task-number: QSR-432
Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-08-15 09:05:43 +03:00
Liang Qi
63181db03e Enable a no-gui build on Ubuntu 18.04 for 5.13
Task-number: QTQAINFRA-2576
Change-Id: I4bc96802b5fe940408158734b01f7b9b01361235
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-14 22:57:35 +02:00
Tony Sarajärvi
8e32f46764 Add Suse Linux Enteprise Server 15 to the CI
Task-number: QTQAINFRA-3123
Change-Id: I725c58c7d319945f7470118dec99b5360385da7b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-08-14 03:45:39 +00:00
Jani Heikkinen
4175af18f8 Add Android x86_64 architecture
It seems those build targets were accidentally deleted when
yaml change was merged in. Targets were there in Qt 5.13.0 release
(before yaml change)

This amends a94696ccd5.

See also ebcfcbe69a.

Task-number: QTBUG-47672
Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-08-13 22:11:31 +00:00
Tony Sarajärvi
24f0367a60 Add Suse Linux Enteprise Server 12 to the CI
Task-number: QTQAINFRA-2851
Change-Id: Ia421a5e35f8a0515d7f761ca0c52a54a93dcee5c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-08-13 11:03:52 +00:00
Liang Qi
03d4a54e34 Merge remote-tracking branch 'origin/5.12' into 5.13.1
Conflicts:
	.gitmodules
	coin/platform_configs/qtbase.yaml

Change-Id: I964ffb430436c62ad675fabc853642800499ade3
2019-08-08 15:31:47 +02:00
Jani Heikkinen
9929aff99e Add QMAKE_LFLAGS_APP+=-s as configure argument in linux desktop build
After adding "-force-debug-info" and "-separate-debug-info" debug information
is going in the binaries accidentally & so on exploding binary size.

Debug symbols are wanted for libraries and adding QMAKE_LFLAGS_APP+=-s as
configure argument will prevent debug information not to go inside binaries.

Task-number: QTBUG-69767
Change-Id: Ieec205402b34870901aeb26d9ca98fa9edb159c6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-08 16:21:20 +03:00
Tony Sarajärvi
b88acae7a8 Partially revert 'Do DeveloperBuild for Boot2Qt'
This partially reverts commit 8f073cea69.

Autotests slow down way too much still, so we can't run developers
builds eveywhere.

Task-number: QTBUG-63152
Task-number: QTBUG-77304
Task-number: COIN-326
Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-08 12:19:38 +00:00
Liang Qi
58977376e1 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie49f7e5ff9ca02522c6611922b47870aba2c152e
2019-08-04 11:51:40 +02:00
Tony Sarajärvi
9da27c5808 Add macOS 10.14 to the CI
Task-number: QTQAINFRA-2938
Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-03 23:01:34 +03:00
Liang Qi
a94696ccd5 Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	.gitmodules
		ignore QtWebEngine on QEMU temporarily.
	coin/platform_configs/default.yaml
		no-gui build was removed temporarily.
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/qtsaferenderer.yaml

Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
2019-08-03 00:02:43 +02:00
Samuli Piippo
fde090e4b5 Add targets for yocto builds
Add empty linux targets that are used by the yaml file from
meta-boot2qt and meta-qt5

Fixes: COIN-320
Change-Id: I574185345a3c3dec0a033e7faed45091b89d4959
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-08-02 09:19:13 +00:00
Konstantin Tokarev
b521ad483c Update platform_configs for QtWebKit
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-01 14:24:48 +03:00
Jani Heikkinen
30b0d05343 Remove 'Packaging' feature from WinRT_10 x86
We don't deliver binaries for that target anymore -> do not export that
either

Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-08-01 12:31:28 +03:00
Juha Karjalainen
38e416be66 Add webAssembly build for windows and macos
Provision emsdk and its dependecies to windows and macos.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-with: Juha Karjalainen <juha.karjalainen@qt.io>
Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-07-31 09:44:53 +03:00
Simon Hausmann
ddbebe9dac Stop building debug-and-release packages for MinGW
The requirement to separate debug and release DLLs on Windows stems from
the Visual Studio C run-time library appearing in two different variants
(debug and release) and not mixing well. It's possible to perform builds
without optimzations and with debug symbols while linking against the
release version of the C run-time, but at the same time the debug
version of the run-time brings other developer visible advantages.

MinGW on the other hand does not have this distinction, does not ship
with separate DLLS and does also not require the VS C runtime library.
Therefore we do not need this separation for MinGW, which means that our
packages can be reduced in size and application developers wishing to
debug their applications do not have to use debug builds of the Qt
libraries or run into Qt internal debug code.

This change is in preparation for turning off debug-and-release in qtbase.
Since coin overrides the Qt defaults, this change needs to be applied first.

Change-Id: I2ed6e2c0ae54cf23f78119d115f8d21906859e35
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-07-29 10:39:08 +00:00
Friedemann Kleint
abfbc0668c Disable tests for MSVC2015/Win32/64bit
Frequent crashes of tst_QDir have been again observed recently in the
dev branch with MSVC2015. It should be sufficient to test MSVC2017;
MSVC2015 should only be compile-tested.

Task-number: QTBUG-58654
Change-Id: I0eb5a1294432a24548468c993418bc18671547bb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Dimitrios Apostolou <dimitrios.apostolou@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-07-29 09:35:08 +02:00
Alexandru Croitor
9f1feaf3a0 Merge remote-tracking branch 'origin/dev' into wip/qt6
Fixes the qtdeclarative quoting around DISTRO_OPTS.
Brings in qtquicktimeline submodule.

Change-Id: I7a6a5ae92a196389aff612b7b0dd98a2d31ff4d0
2019-07-07 13:41:22 +02:00
Liang Qi
a319bc5f5f Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: I97c42bef6632a4aeccefab008e0f615f7a9e9f78
2019-07-05 20:05:17 +02:00
Jędrzej Nowacki
caacdfc3e1 Remove "-DBUILD_TESTING=OFF" from default configs
It is not needed. QtBase build instructions add it explicitly, as
the tests are build with a separate cmake call (to compile tests
against differently installed Qt).

Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 13:47:59 +00:00
Jędrzej Nowacki
8e54519b75 Do not specify compiler binary name directly
We have a code that handles that implicitly so it is not needed anymore.

Change-Id: I4aea2f55f9efd24ec7cf22cb8b413789ec3e7fea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 13:47:52 +00:00
Toni Saario
107fb06016 Fix extra file and missing library in platform configurations
Missing libraries in no-gui platform.
Default.txt was supposed to be removed by
    439a1eb220

Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-07-02 06:47:59 +00:00
Toni Saario
439a1eb220 Change configuration files into yaml format
Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-07-01 10:28:29 +02:00
Tony Sarajärvi
8c4ac28b0d Add correct openSSL arguments to no-gui builds
Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-28 11:43:45 +03:00
Konstantin Tokarev
3a940903c0 Make header line in qtwebkit.txt longer to prevent parsing error
Change-Id: I0531f91af397d09cfa7eae96c0d779d3055b0456
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-25 10:47:00 +03:00
Liang Qi
245f5afd71 Remove DisableTests in features
At least we can get tests built now.

Change-Id: I7830f495002083023651ca5da3c6c39e745f920f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-24 11:42:34 +00:00
Konstantin Tokarev
35c1c88749 Update platform_configs for QtWebKit
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I02f6649b77e89b9acb3bdd516419aa12817caaa3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-24 13:02:11 +03:00
Jędrzej Nowacki
61d838e4f0 Move ICC compiler name setup to instructions level
That way we can simplify product level configuration.

Change-Id: Ib855c1873d3b4566b437845ab18182a0db8e45b9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-24 06:25:02 +00:00
Simon Hausmann
5464a31c61 Enable freetype on the Windows build
With the newer vcpkg this works now.

Change-Id: I8408041b338ffbe74aaec9afbb1cf8cbf3bb1d92
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-21 11:59:51 +00:00
Simon Hausmann
9d7437859b Update vcpkg installation
Use the latest snapshot, fetch the package set from the repo itself and
set the VCPKG_ROOT environment variable as that's the vcpkg documented
interface.

The qt specific triplet defaults to static linkage, which allows
removing the %PATH% handling and resembles the same setup as in Qt 5
where we linked the 3rd-party code statically into qt.

Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-21 11:59:42 +00:00
Jędrzej Nowacki
b62c39f49f Increase CI test coverage by changing GCC to ICC
There is already other place in which we compile with GCC on Linux.

As we use ninja now, it has to be installed on open suse too.
Cmake port depends on system libraries therefore pcre2 needs to be
installed.

Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-17 10:56:43 +00:00
Heikki Halmet
644f8b7006 Fix openssl 1.1 library configurations
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>

(cherry picked from commit de41591477)
Change-Id: Ifbb5ecc4613319265a3378b60959fffc7301ae46
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-13 22:47:35 +03:00
Alexandru Croitor
cfd35cc498 Add a new Linux config that builds a static developer build
Change-Id: I8e40ed674cf0a72223a0180296db8eaa6eb6da06
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-12 14:42:31 +00:00
Liang Qi
8f2b2dba78 Enable windows and macOS builds for yaml and cmake
Change-Id: I91aea0fe59e77cf95f7441c646e95d038f0e0032
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-12 11:17:32 +00:00
Jani Heikkinen
fd1f34192a Fix qt5.git builds
some '-' is missing from qt5.txt causing coin to ignore all configurations
from that file. So adding enough '-' in title column to solve the issue.

Change-Id: I0b8fa6c98efeece1bf93592bbb60ca627962ceee
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2019-06-12 13:39:26 +03:00
Heikki Halmet
a05bd71ede Disable MySQL from packaging builds
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-06-05 13:25:23 +03:00
Heikki Halmet
ebcfcbe69a Add Android x86_64 architecture
Task-number: QTBUG-47672
Change-Id: If5044e601ceedcd47a1ab9299f6a8e5721314ecc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-25 08:47:52 +03:00
Jędrzej Nowacki
79bc4f0771 Move some configure arguments to qtbase instructions
These arguments are specific to the build and changes to them are _not_
affecting configuration.

Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-22 15:35:44 +00:00
Juha Karjalainen
3e838f2a34 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-22 15:34:04 +03:00
Liang Qi
20e8121c77 Use yaml configuration file for cmake support
It is needed by new coin to support cmake build as only
there configuration arguments are separated from features.

Change-Id: I960ec693f80803fd86de472efc953a38358ae14e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-05-20 12:37:44 +00:00
Allan Sandfeld Jensen
edc39be08b Fix qtdeclarative boot2qt CI config
DISTRO_OPTS was missing quotes.

The same thing is also done in 3e6a04c09d.

Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit 04fa1bf4ef)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 10:42:41 +00:00
Frederik Gladhorn
5677a43a25 Remove platforms from Qt 6
Get to a smaller set to reduce load on the CI and have faster
turnaround times while developing. Remove some older compilers
that do not support the minimum C++ feature set we want to require
for Qt 6.

We'll need to revisit and probably expand this set when we get closer
to releasing Qt 6.

Change-Id: I6afba8b3caca0fac5bbf80efdcde7714b8d1ab76
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-05-16 08:33:58 +00:00
Ulf Hermann
3e6a04c09d qtdeclarative platform config: Add missing quotes
Change-Id: Ib8c0a2aad21718dba25728d3ac869c23f314554a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 04:14:30 +00:00