Commit Graph

4592 Commits

Author SHA1 Message Date
Liang Qi
c1c44574f6 Merge remote-tracking branch 'origin/5.15.0' into 5.15
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
	coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
	coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1

Change-Id: Ic7ed52251573824595821c53025323287d60b536
2020-05-28 10:22:03 +02:00
Joerg Bornemann
4d99fb00cc Fix CMake provisioning for Ubuntu 18.04 x86_64 QEMU armv7
This amends 68134db4.

Change-Id: I2eed240464f1b29c119ca0119001997aefdecd41
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-05-27 08:06:16 +02:00
Qt Submodule Update Bot
9a4fc7074c Update submodules on '5.15' in qt/qt5
Change-Id: Iaf309cc8b2404cd9a34a6b5b04331a3acc33794f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-27 06:26:07 +02:00
Alexandru Croitor
68134db435 Update provisioned CMake version to 3.17.2
This should fix the ninja deps issue we had on Windows with the
Ninja Multi-Config generator, where calling ninja a second time to
rebuild the project failed.

More details at https://gitlab.kitware.com/cmake/cmake/-/issues/20723

Change-Id: I0029e57fbc704120d2241499a87cad0ad40c2e50
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-26 21:57:20 +02:00
Alexandru Croitor
0685312d2e CMake: Add MinGW config to all cmake enabled repositories
Task-number: QTBUG-75578
Change-Id: I4957efff9f3438c85f9e653130898d4b60a555ba
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-25 21:04:48 +02:00
Alexandru Croitor
5cd8e9576d CMake: Switch qtbase Windows config to use Ninja Multi-Config
And configure with two configurations, RelWithDebInfo and Debug.
This is equivalent to qmake's
--debug-and-release --force-debug-info

This should give us minimal coverage for debug-and-release builds,
as well as avoid regressions with NMC aka multiple configurations.

If the qtbase builds successfully, we can try to extend the rest of
the repositories to also build with NMC on Windows.

We can't add such a configuration to macOS for now, because it
requires CMake 3.18, which is not released yet.

Disable PCH because it seems to fail the build when used together
with Ninja Multi-Config.

Task-number: QTBUG-80900
Change-Id: I71a9584ddb1d48ed22925f67b50891e102036c97
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-25 13:41:38 +02:00
Tasuku Suzuki
598f82300a Remove the qtquickcontrols2 dependency on qtgraphicaleffects
The Material style uses its own shader effects, and
recent patches did the same for the Imagine style.
There were some auto tests that have been made to only
run if qtgraphicaleffects is available.

Change-Id: Ifcfcad9591d2a0a8d5ebed505566cd0103dd9176
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-05-23 00:47:42 +00:00
Heikki Halmet
16ca898568 Provisioning: Update QNX7 SDP to include OpenSSL 1.1.1
Still includes ICU 58

Task-number: QTQAINFRA-3537
Change-Id: I2f532ff32157e09eeec9a2196d075d4ec6347df5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-05-22 14:09:47 +03:00
Heikki Halmet
fa58a227cd Provisioning: Change resolution for Windows 10 x86_64
Currently we have wrong resolution (1024x768) for 64-bit Windows.
Correct one is 1280x800

Change-Id: Ifc17933a5901681a917f973cab4d7c1ca1dfbd9f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-22 12:23:34 +03:00
Qt Submodule Update Bot
4f504b9e3f Update submodules on '5.15' in qt/qt5
Change-Id: I2cc7f7cd47bbf116a3cc01b42c58d0e09162ac3e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-20 23:46:57 +02:00
Alexandru Croitor
afc08c23ca CMake: Enable CMake builds for qttranslations
Fixes: QTBUG-82969
Change-Id: I17e7df82f578338d6c1e3dbc41677d4302d9689b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-20 14:48:59 +02:00
Liang Qi
434e2712aa Update submodules on 'dev' in qt/qt5
Change-Id: Idd8c485848379879aa3d870ddf9740eab2fb95d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-05-20 13:37:23 +02:00
Qt Submodule Update Bot
cbb4768052 Update submodules on '5.15' in qt/qt5
Change-Id: Ia54db5b603a3e31c570d1c7e4ab4cd409b9bd53e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-18 23:46:40 +02:00
Qt Submodule Update Bot
f4b02da372 Update submodules on '5.15' in qt/qt5
Change-Id: I6e5027ff7b70605a77f35b42f07a0e3ad9bb2f12
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-15 12:10:57 +02:00
Alexandru Croitor
71a559e748 CMake: Enable CMake builds for qtdoc
Change-Id: Idca63aef8951a4a104b816e4aac710225d1279c2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-14 13:25:23 +02:00
Lars Knoll
688187773b Explicitly enable -headersclean on some configs
This is in preparation to turning this off by default in configure,
as it increases build times significantly.

Change-Id: I2d601595ce8c093765194f36ec5235f79dd4dd7d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-13 22:17:58 +02:00
Alexandru Croitor
3384823666 Revert "Temporarily ignore qtnetworkauth"
The qtnetworkauth test was fixed, so we can re-enable the module.

Bump the sha1 to the latest version of qtnetworkauth.

This reverts commit a8d3591327.

Task-number: QTBUG-84071
Change-Id: I68c953fa97cf0f28a391b496fb321aefe9d8e7d6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-05-13 11:47:37 +02:00
Tony Sarajärvi
38139878ff Install GCC 10 on SLES 15
Task-number: QTQAINFRA-3444
Change-Id: Iaf9b3ea5331cfc0b3d19a09f55aa4df1de93fbb2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-05-12 16:40:28 +00:00
Alexandru Croitor
e4d60dd117 CMake: Enable CMake builds for qtvirtualkeyboard
Task-number: QTBUG-78185
Change-Id: Ie8a120aa3425edf6ae18f4a43dcd3f6aa697cd9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-12 13:18:00 +02:00
Alexandru Croitor
29c9ba1835 CMake: Switch to MinGW 8.1 configuration for the qtbase CMake build
Change-Id: I974d34a33370ece9f9e240ba6e5106cc50d8bf84
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-12 13:02:52 +02:00
Qt Submodule Update Bot
bca97664c6 Update submodules on '5.15' in qt/qt5
Change-Id: Id17a8894c6eb326e68a5cad454ee193fb4b0381e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-12 10:12:31 +02:00
Heikki Halmet
69342bb5b7 Revert "Provisioning: Disable windows defender firewall"
This reverts commit 48ff0140de.

Reason for revert: QtBase WinRT test qcoreapplication needs mpssvc service to be enabled

Change-Id: I523b668d9d7292aaaf7462585dc03819a3973010
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-12 05:42:53 +00:00
Qt Submodule Update Bot
717364e3e1 Update submodules on '5.15.0' in qt/qt5
Change-Id: I5d348235045f06b87d3cef2752e87bfb5486ab50
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v5.15.0
2020-05-12 04:06:03 +00:00
Qt Submodule Update Bot
ca2d7b6a5b Update submodules on '5.15' in qt/qt5
Change-Id: I4d55ef3f569169b96dbc7b88c9bfd877499e0921
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-11 12:44:36 +00:00
Qt Submodule Update Bot
d20eaafc5c Update submodules on '5.15.0' in qt/qt5
Change-Id: I7237b1851b031f6b6ec8e949be1b2326228d379d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.15.0-rc2
2020-05-09 11:32:43 +00:00
Qt Submodule Update Bot
b3777f0703 Update submodules on '5.15' in qt/qt5
Change-Id: I77cfc30c6202b776fc20813f5e71162b6f46c04e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-08 23:45:59 +02:00
Qt Submodule Update Bot
d913a868d4 Update submodules on '5.15.0' in qt/qt5
Change-Id: Ia3881b1668420fed08caf6a4fb8a8b957ac98789
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-08 12:12:34 +00:00
Qt Submodule Update Bot
cb2293ae0a Update submodules on '5.15' in qt/qt5
Change-Id: I4c98f9f6176d4b2c657880ea3d8e106501fc8906
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-07 23:46:03 +02:00
Liang Qi
a8d3591327 Temporarily ignore qtnetworkauth
Task-number: QTBUG-84071
Change-Id: I8486c55dc7062f50e7722b03031750b58be23a1f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-07 21:52:26 +02:00
Alexandru Croitor
3652f77aa3 Provisioning: Set macOS locale to "en_US.UTF-8"
The 419f42903154489e2dace8d1eba183036275448b commit in qtbase
introduced a regression where the tst_fusion test in qtqtuickcontrols2
hits a deadlock while trying to print a warning about a non-UTF-8
locale.

The warning is due to the fact that the agent executed in Coin's VM
does not have an explicit locale set, and thus it defaults to "C".
There is no explicit locale set in any .bashrc (or similar files),
and neither in any launchd configuration (because the agent is
executed at macOS startup via launchd).

The deadlock is due to trying to acquire the same lock twice while
trying to write output to stdout.

The test only deadlocks on CMake configurations, and not qmake
configurations, because Coin has a hardcoded instruction to set the
locale to UTF-8 when running qmake tests.

Until the deadlock situation is addressed in another change, the issue
can be fixed by setting the macOS configuration locale to UTF-8
explicitly, by assigning the LANG environment variable
into ~/.bashrc at provisioning time, like we do with other environment
variables like PATH.

Fixes: COIN-578
Change-Id: Ib6a5849a6868c1776dd425aeb8b5e7d6faa8cde0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2020-05-07 21:52:16 +02:00
Qt Submodule Update Bot
826d95df85 Update submodules on '5.15' in qt/qt5
Change-Id: I1d5374eb04e8bb23af1581c4f091503ccc1fe310
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-06 23:46:05 +02:00
Heikki Halmet
48ff0140de Provisioning: Disable windows defender firewall
Service is still running. It need to be disabled.

Change-Id: I4742f97c93d118a1a98b4107f1597d332c3f1391
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-06 14:44:31 +03:00
Qt Submodule Update Bot
e85c0e88cf Update submodules on '5.15' in qt/qt5
Change-Id: I95cc4f3c7d2b6d745e50c4fe5405527a06423c24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-05 19:53:44 +02:00
Qt Submodule Update Bot
db44923e30 Update submodules on '5.15.0' in qt5
Change-Id: I9e83c1d5063f0e6013bd1667987cea949e77809a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
v5.15.0-rc1
2020-05-05 08:30:54 +00:00
Qt Submodule Update Bot
2bc89aec9b Update submodules on '5.15' in qt/qt5
Change-Id: I9d169c17ce5772771e51bc58463919ed7c8ed0a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-04 23:46:00 +02:00
Alexandru Croitor
9f4a39356a CMake: Switch host macOS configurations to framework release builds
Also include debug info. This is the equivalent of qmake's
--release --framework --force-debug-info --separate-debug-info

Change-Id: I2778b4998890146c82552f9c721a48174a764839
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
2020-05-04 22:50:17 +02:00
Alexandru Croitor
4dace06297 CMake: Enable a MinGW 7.3 CMake qtbase configuration
It should be a developer build, but due to some features
that are not ported in src/gui/configure.cmake (directwrite)
there are compilation errors due to unused arguments in
static bool QWindowsFontDatabaseBase::init(QSharedPointer)
in platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp

So it's not a developer build for now.

Task-number: QTBUG-75578
Change-Id: Ieb6daca45473ea42748a39f3e9e33a9db087a0e0
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
2020-05-04 18:01:22 +02:00
Liang Qi
9deba571f9 Temporarily disable QNX builds because license expiry issue
Task-number: QTQAINFRA-3708
Change-Id: I676ad2e519ab527e079648d41a1ff015a2a17657
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-04 15:16:19 +02:00
Heikki Halmet
8f653ce4f8 Provisioning: Add sleep before killing gpg-agent in msys installation
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
(cherry picked from commit 5f03b84e65)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-04 14:42:03 +03:00
Heikki Halmet
71043ca243 Provisioning: Update expired QNX license
Task-number: QTQAINFRA-3708
Change-Id: Id2d6d10d88fc50c9985014c44df0b1cf51cc3410
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-04 14:41:54 +03:00
Qt Submodule Update Bot
e2d2d25a57 Update submodules on '5.15.0' in qt5
Change-Id: I4e92a9fdd0602c41477345169899623c036e5edb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-04-30 17:43:46 +00:00
Liang Qi
54c94ae681 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
2020-04-30 18:35:08 +02:00
Qt Submodule Update Bot
ff4a1141f2 Update submodules on 'dev' in qt/qt5
Change-Id: I96f194ffeecc40522b5ed69b0bd2d2e03045cfd9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-30 15:44:59 +02:00
Simon Hausmann
3265e93168 Try to build qtbase with cmake against Yocto
This adds the basic armv7 configuration and passes through two
additional variables for use in the build instructions:

    * QT_YOCTO_ENVSETUP points to the environment-setup script that the
    Yocto SDK expects to be sourced before building against the target
    sysroot.

    * QT_CMAKE_DIR points to the directory that contains our cmake
    installation. Since the environment-setup prepends the Yocto host
    bin dir to the PATH, we'd end up picking the wrong cmake.

Also the choice of system Harfbuzz is disabled as Qt does not build
against the version shipping in Yocto.

Change-Id: I8d657e773143c4db0e2437d029d62372f7b7e638
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-30 12:02:42 +02:00
Heikki Halmet
5f03b84e65 Provisioning: Add sleep before killing gpg-agent in msys installation
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
Reviewed-by: Simo Fält <simo.falt@qt.io>
2020-04-30 11:05:15 +03:00
Qt Submodule Update Bot
d937578404 Update submodules on '5.15.0' in qt/qt5
Change-Id: I2fe48b7e734bdf86f159af47cd2b6f613172afa2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-29 12:14:01 +02:00
Alexandru Croitor
4aa9c4df11 CMake: Enable CMake builds for qtquick3d
Change-Id: I9547c73e8a632754d043bff8c72c29c18449bfd9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-27 10:04:09 +02:00
Qt Submodule Update Bot
20668c9233 Update submodules on '5.15' in qt/qt5
Change-Id: Ia0fb6c1f5f1ae1dafaf0999fdc7c1cc5ba765bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-26 23:45:55 +02:00
Qt Submodule Update Bot
d88858d98b Update submodules on '5.15.0' in qt/qt5
Change-Id: Id2db92b9b2928ea7452edb313cc673581bf12b35
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-25 08:30:51 +02:00
Qt Submodule Update Bot
230e99400c Update submodules on '5.15' in qt/qt5
Change-Id: I6dd7a38815ff1bd13b3b8d1c9a4042c3b0981784
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-24 23:46:00 +02:00