lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-25 22:27:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,540 Commits 120 Branches 274 Tags
2d577a83ecdcddcfbdf52dc01984e9313ad8b898
Commit Graph

11 Commits

Author SHA1 Message Date
Liang Qi
29befcc995 Merge remote-tracking branch 'origin/5.13' into 5.14 
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml

Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
 2019-10-01 11:37:07 +02:00
Liang Qi
076fb6bd6d Merge remote-tracking branch 'origin/5.13.1' into 5.13 
Conflicts:
	coin/platform_configs/qt5.yaml

Change-Id: Iaeec542042807c00e4c2597b546b00ce0f267b48
 2019-09-27 07:27:28 +02:00
Jani Heikkinen
2cec2c5f8c Add build for combined android targets 
From 5.14 -> android builds are done by default at one go. Add new builds
for doing that.

Removing old, separate builds will be removed in a follow-up patch to
give time for packaging to adapt that new system

Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
 2019-09-24 12:08:17 +03:00
Heikki Halmet
fa03dbce1f Platform configurations: Move Android_ANY (clang-x86) to default 
Arm targets from default change places with clang-x86 from qt5

Task-number: QTQAINFRA-3153
Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2019-09-12 20:51:28 +03:00
Liang Qi
8c00a4f011 Add webAssembly build for windows again 
This reverts commit 9a8fb868ec
partially.

See also 38e416be66.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Change-Id: I6a63c2c437bd1568d88ffae0b565b99c15188770
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-09-10 06:13: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
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
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
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
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