lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,423 Commits 118 Branches 270 Tags
14d2852597f7c869e91db2f54d954965af6083fb
Commit Graph

3423 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
1eae3c4185 Update submodules on 'dev' in qt5 
Change-Id: I87be62d19a3aee1fae16cdf27fd35ec67e30130d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-07 09:04:49 +02: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
Christian Strømme
ff75bd5297 Add QtQuick3D as a submodule in qt5.git 
Adds QtQuick3D as a preview module in dev

Task-number: QTBUG-77724
Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
 2019-08-26 12:43:06 +03:00
Qt Submodule Update Bot
5f8a9b15de Update submodules on 'dev' in qt5 
Change-Id: If400cccb49bb5d470ba79077b2e9e78e8410194d
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-23 06:55:03 +02: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
eb7370a7af Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-08-21 05:56:56 +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
Qt Submodule Update Bot
42366fd740 Update submodules on '5.13' in qt5 
Change-Id: I082dbfe9cd927aa112760db67e4657868289c4e2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-14 22:25:00 +02:00
Alexandru Croitor
8c2ecdbc27 Update qt5 wip/qt6 
Bump qtwebengine sha1 and re-enable qtwebengine and qtwebview to
be built.

Change-Id: I5f9f57b1083629e4294b4a34b74780a862d9e873
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-14 13:08:44 +02:00
Liang Qi
2fd2a9d268 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-08-14 07:02:19 +02:00
Liang Qi
82e0fe1664 Merge remote-tracking branch 'origin/5.13.1' into 5.13 
Change-Id: Ifc39acfc1a0ba6019091a194088e99e451f99bde
 2019-08-13 10:49:03 +02:00
Qt Submodule Update Bot
c63dd0ddfd Update submodules on 'dev' in qt5 
Change-Id: I912e43550293e17b22e1401d50e7a4a06ee4c3b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-12 23:02:33 +02:00
Simo Fält
d19f60d745 Provisioning: Append the emscripten to path instead of prepend 
Having it first in path seems to cause some confusion when detecting
libc++ in darwin.

Change-Id: I841e7f169e4771d3818cf156d9d78fc242e9995c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-08-12 21:01:55 +00:00
Qt Submodule Update Bot
19cc6b2b80 Update submodules on '5.13.1' in qt5 
Change-Id: Ibe04f05d2195953f6ab7305472d1700ec1c73312
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-12 21:25:08 +02:00
Alexandru Croitor
621c18b60b Update qt5 wip/qt6 
Point qt3d, qtdeclarative, qtgraphicaleffects, qtimageformats,
qtnetworkauth, qtquickcontrols2, qtsvg to latest wip/qt6.
Also re-enable the qt3d build.

Change-Id: If9d122e064021b500a423376b991edbb5c1903fc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2019-08-11 13:42:14 +02:00
Qt Submodule Update Bot
edf6149a5b Update submodules on '5.13' in qt5 
Change-Id: Id153f5c742637fe66bb9010fa41cb62645fb4e4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-11 12:04:31 +02:00
Alexandru Croitor
f46f85b0c7 Update qt5 wip/qt6 
Point qtbase to latest wip/qt6.
Temporarily disable building qt3d because it fails with the new qtbase
version, but updating it with old SHA1 of qtbase is also not possible.

Change-Id: I232920be48f01608f196c24370c684eccbd3994f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-10 00:17:47 +02:00
Qt Submodule Update Bot
8ede8851f4 Update submodules on '5.13' in qt5 
Change-Id: If3fe6bab310eb0e403c040ea465ac8197a7059a2
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-09 16:22:39 +02:00
Liang Qi
1f79ae5d86 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-08-09 16:22:09 +02:00
Alexandru Croitor
3e396d5ef1 Update qt5 wip/qt6 
Point qtbase to wip/qt6.

And use new sha1s for other repositories when needed.
And update .gitmodules branch to point to wip/qt6.

Change-Id: Ic12a106d1b491f77277419a27b61396ba07f1737
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-09 15:59:54 +02:00
Qt Submodule Update Bot
4230f4ac54 Update submodules on 'dev' in qt5 
Change-Id: Ic8e437d68ed59391f9a0c5c73cc57298a109b02f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-09 13:00:53 +02:00
Liang Qi
49c808befb Merge remote-tracking branch 'origin/5.13.1' into 5.13 
Conflicts:
	.gitmodules

Change-Id: I9b4e8807941f49ed930372cc3466c97110794849
 2019-08-09 09:02:41 +02:00
Qt Submodule Update Bot
9e370453bb Update submodules on '5.13' in qt5 
Change-Id: Ibcdd2991705555bda542b60c25dbdb0e3dd572cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-08 23:13:30 +02:00
Liang Qi
f32c9f755e Include QtWebEngine again 
This reverts commit a94696ccd5 partially.

Task-number: QTBUG-77304
Task-number: QTBUG-77305
Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-08 22:51:04 +02:00
Qt Submodule Update Bot
0f89c02328 Update submodules on '5.13.1' in qt5 
Change-Id: I73c133a6ae2e6a84cd21f3d4f19803d510d23e04
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-08 22:50:57 +02:00
Liang Qi
9b186a9d36 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13.1" 2019-08-08 22:50:52 +02: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
Liang Qi
42bfac5bf8 Include qtvirtualkeyboard again 
This partially reverts commit 452e0d94d4.

Task-number: QTBUG-76371
Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
 2019-08-08 14:19:46 +02: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
Qt Submodule Update Bot
f08bd26eeb Update submodules on '5.12' in qt5 
Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-08 11:45:10 +02:00
Qt Submodule Update Bot
b326a502db Update submodules on '5.13' in qt5 
Change-Id: If03f5533dcfb83ac2002f109118b5bfa8a4bad5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-08 00:45:02 +02:00
Qt Submodule Update Bot
f511a2d74f Update submodules on '5.13.1' in qt5 
Change-Id: I6073c33388af514d7eb0f014b13cb6694235f650
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-07 12:14:24 +02:00
Qt Submodule Update Bot
2b738468de Update submodules on '5.13.1' in qt5 
Change-Id: Ia6d7873072055e86c1aea5c33694ba376a867fa3
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-07 10:35:33 +02:00
Liang Qi
f8439ea42c Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1" 2019-08-07 10:35:16 +02:00
Liang Qi
13b206662b Merge remote-tracking branch 'origin/5.13' into 5.13.1 
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.

 Conflicts:
	.gitmodules

Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
 2019-08-06 11:46:15 +02:00
Qt Submodule Update Bot
b41a217f35 Update submodules on 'dev' in qt5 
Change-Id: Ic29d83fa0488cc77726adde23f21c68f0d7fecc3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-06 06:15:27 +02:00
Qt Submodule Update Bot
2fb0e4f352 Update submodules on '5.13' in qt5 
Change-Id: I9498fe9045d23ec400d9437f375d547f054909b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-06 06:12:03 +02:00
Qt Submodule Update Bot
2970d3660c Update submodules on '5.13' in qt5 
Change-Id: If5c6d3363438d613e5ea96bc84018ef913067296
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-05 11:28:51 +02:00
Liang Qi
1e476b01fd Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-05 11:28:39 +02:00
Qt Submodule Update Bot
cb14d29efe Update submodules on 'dev' in qt5 
Change-Id: I72ceb9f1c47f5786a8a061b744e085aadb5e17a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-04 23:01:00 +02: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
689ed30f2a Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-03 00:08:09 +02: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
Qt Submodule Update Bot
4c609c4db3 Update submodules on 'dev' in qt5 
Change-Id: I83e4cfe7c9598e4454b2007c993413d85f7a3785
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-02 09:12:07 +02:00
Qt Submodule Update Bot
4c5d3f2e43 Update submodules on '5.13' in qt5 
Change-Id: Ia8f240a565043822fec60ce29b348bb79846919e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-01 22:31:04 +02:00
Qt Submodule Update Bot
1fbba6d1ce Update submodules on 'dev' in qt5 
Change-Id: Ifa9d7423aeb8bbc179dd31b38c5b1368c8f54146
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-01 14:52:08 +02:00
Konstantin Tokarev
125c5e6528 Provisioning: update conan_manifests for libxslt packages 
Package recipe was improved, as a result packages were rebuilt and
checksums need update.

Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-01 14:24:56 +03:00