lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-24 21:57:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,550 Commits 120 Branches 274 Tags
4e5a86d2bbe6cd30e46a364f96a861b37bbf7f96
Commit Graph

7 Commits

Author SHA1 Message Date
Liang Qi
44073f5563 Merge remote-tracking branch 'origin/dev' into wip/cmake 
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt

Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
 2019-09-23 16:38:06 +02:00
Juha Karjalainen
38e416be66 Add webAssembly build for windows and macos 
Provision emsdk and its dependecies to windows and macos.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-with: Juha Karjalainen <juha.karjalainen@qt.io>
Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-07-31 09:44:53 +03:00
Jędrzej Nowacki
b62c39f49f Increase CI test coverage by changing GCC to ICC 
There is already other place in which we compile with GCC on Linux.

As we use ninja now, it has to be installed on open suse too.
Cmake port depends on system libraries therefore pcre2 needs to be
installed.

Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-06-17 10:56:43 +00:00
Juha Karjalainen
3e838f2a34 Provisioning: Change openssl version to 1.1.1b 
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-05-22 15:34:04 +03:00
Liang Qi
8710c7d9cf Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
 2019-04-13 11:38:39 +02:00
Liang Qi
85eb7b7a03 Merge remote-tracking branch 'origin/5.12' into dev 
Conflicts:
	coin/platform_configs/default.txt

Change-Id: Ie21baa51738ce0761fb45fba3819b1894cc808b6
 2019-01-23 08:02:11 +01:00
Tony Sarajärvi
89e0159bbc Swap openSUSE 42.3 to 15 
Task-number: QTQAINFRA-2067
Change-Id: I71f79181704d6ce8faac0019f6d7a5016b0ecb5e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2019-01-10 17:39:51 +00:00