lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-02 03:36:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,425 Commits 118 Branches 270 Tags
efdd6f944b392d4fda1e984040744acd4fd5318e
Commit Graph

4425 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Liang Qi
3050559262 Merge remote-tracking branch 'origin/5.15' into 5.15.0 
Conflicts:
	.gitmodules

Change-Id: I72e0314fbc563a2386f2389239b927f57124c511
 2020-04-24 22:34:43 +02:00
Liang Qi
5b018f96af Update submodules on '5.15' in qt/qt5 
Change-Id: I06f83013c085e342e8391a705ba5ecf156bd5159
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-24 15:59:44 +02:00
Liang Qi
cc4fdea014 Merge remote-tracking branch 'origin/5.14' into 5.15 
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsdk.yaml
	coin/platform_configs/tqtc-qt-rta.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
 2020-04-24 15:31:01 +02:00
Qt Submodule Update Bot
ac8b28db57 Update submodules on '5.14' in qt/qt5 
Change-Id: I919625c0e3a2fdd5dea9dab691c9bc96f62161fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-24 09:48:03 +02:00
Liang Qi
882294edc3 Merge remote-tracking branch 'origin/5.14.2' into 5.14 
Conflicts:
	.gitmodules

Change-Id: I950588f85d1b39ba6ce994821db9f340b72fa6d2
 2020-04-23 12:27:46 +02:00
Qt Submodule Update Bot
10e07c7877 Update submodules on '5.14' in qt/qt5 
Change-Id: Ibdc80d4d7abad334e96f6c5d7c602e42a9d1b31f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-23 10:32:55 +02:00
Qt Submodule Update Bot
767711b44a Update submodules on '5.15.0' in qt/qt5 
Change-Id: Iba9ab3074ef49a9060ce594a0d30083891338e28
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-23 08:13:47 +02:00
Qt Submodule Update Bot
285f2c5690 Update submodules on '5.15' in qt/qt5 
Change-Id: I62fa79986a2ccbf3ee4e000f4f767731bf31fd2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2020-04-23 06:02:52 +02:00
Qt Submodule Update Bot
4d435697fa Update submodules on '5.15' in qt/qt5 
Change-Id: I0c4e65146b752463190fc98e9f670c3b00eac283
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-21 23:46:35 +02:00
Allan Sandfeld Jensen
ca914bdbf3 Fix qtwebwengine.yaml 
Missing an initial separator

Change-Id: I1f447963fbaa93027cfffd7c320efc69ea4a1107
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-21 16:46:47 +02:00
Qt Submodule Update Bot
133403b829 Update submodules on '5.15' in qt/qt5 
Change-Id: Ic1acfd2ae08a13f88e45e822a34b673e7470aa72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-21 10:57:24 +02:00
Allan Sandfeld Jensen
9b7a95964d Add qtwebengine.yaml 
We can't build the wasm version of qtbase any longer

Change-Id: I7436640941702ba2479c7e73f3d1d9ccaf2e7709
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2020-04-21 10:02:36 +02:00
Volker Hilsheimer
82ed571cde Add Pick-to footer for cherry-pick bot to commit template 
Change-Id: Idec00573bdbebda4d3b3481eee480c91c5d8d1de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2020-04-20 11:04:27 +02:00
Qt Submodule Update Bot
30b0878b18 Update submodules on '5.15' in qt/qt5 
Change-Id: I53ce054fd386e55c6b9b0954c8636716a4ae08b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-17 23:46:29 +02:00
Qt Submodule Update Bot
cafd0f0019 Update submodules on '5.14' in qt/qt5 
Change-Id: Ifdae4eace5516c6b2886560c7c5da46954b8e712
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-17 22:31:06 +02:00
Qt Submodule Update Bot
908afb868a Update submodules on '5.15' in qt/qt5 
Change-Id: I9c627825712c1c2bc196a8e0d3259189aa43d71b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2020-04-16 23:46:26 +02:00
Kari Oikarinen
f008144b88 Adjust submodule branches 2020-04-16 09:14:58 +03:00