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

3430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liang Qi
bbc7794b64 Update submodules on '5.14' in qt5 
Change-Id: I98f238f0dbe8cb3537808457b448c7e61ac533a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-10 06:13:09 +02:00
Liang Qi
f0a89a32da Update submodules on '5.14' in qt5 
Change-Id: Ice4211fcc08fa25a55d6a5be1b236b3bdc12c9e1
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-06 11:06:00 +02:00
Liang Qi
700540f77a Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.14" 2019-09-04 09:42:18 +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
Jukka Jokiniva
80791b03ee Update qtbase submodule on 5.13.1 in qt5 
Change-Id: Ia5d9429b6cfc0804355a2161a18f030db6fa6dae
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
v5.13.1 		2019-09-02 19:48:24 +03:00
Qt Submodule Update Bot
314d3efaf0 Update submodules on '5.14' in qt5 
Change-Id: I0f5fdbd9f369dc42dd4c97dad1cb933753220e58
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-29 18:20:58 +02:00
Liang Qi
e6e51c07f5 Merge "Merge remote-tracking branch 'origin/dev' into 5.14" 2019-08-27 00:39:02 +02:00
Liang Qi
6f3f8913d8 Merge remote-tracking branch 'origin/dev' into 5.14 
Conflicts:
	.gitmodules

Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
 2019-08-26 18:31:59 +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
3631a12b84 Merge "Merge remote-tracking branch 'origin/dev' into 5.14" 2019-08-21 08:31:18 +02:00
Liang Qi
04f8b0619d Merge remote-tracking branch 'origin/dev' into 5.14 
Change-Id: Iaccaf809372bc6132af4e25af2ca8b163b810e0a
 2019-08-21 08:26:49 +02:00
Qt Submodule Update Bot
e27c7adda7 Update submodules on '5.13.1' in qt5 
Change-Id: I6a801fd43a71d5ba772e71dae4101a6edbbcac95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-21 04:09:06 +00: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
acafe0ad49 Update submodules on '5.13.1' in qt5 
Change-Id: I0f321007da9f236c069703125d5529a54ad27c9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-19 14:04:16 +00:00
Paul Wicking
2e9314967c Adjust submodule branches 2019-08-19 15:11:54 +02:00
Qt Submodule Update Bot
b959cb5359 Update submodules on '5.13.1' in qt5 
Change-Id: I4f319b0afe7e7369eb7db168f66ec57ed867c267
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-18 23:00:57 +02:00
Qt Submodule Update Bot
b03790e34d Update submodules on '5.13.1' in qt5 
Change-Id: I6c95fa658c52571ce1e0588eac1b9763f0bae549
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-16 23:01:16 +02:00
Qt Submodule Update Bot
3277628d62 Update submodules on '5.13.1' in qt5 
Change-Id: Ic89472db863aedd92db57dbaaf2dd5fd10efa96f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2019-08-15 05:39:39 +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
Qt Submodule Update Bot
8d90ddd531 Update submodules on '5.13.1' in qt5 
Change-Id: I2324f8a205f5e7fcb4cfea9e7e845ef9f4f867e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-14 16:20:11 +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
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
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
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
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
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