lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-26 00:16:26 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,803 Commits 120 Branches 273 Tags
69342bb5b7b85a5bee2a8e1bdb7cf3ce80bc5e5c
Commit Graph

6 Commits

Author SHA1 Message Date
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
Tony Sarajärvi
2b7355e69c Update MinGW 7.3.0 to Mingw 8.1.0 
Task-number: QTQAINFRA-3304
Change-Id: I4a962c112f4925224e91c08117c7324112d70729
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
 2020-03-23 14:53:02 +00:00
Konstantin Tokarev
7ba8c15d79 Update platform_configs for QtWebKit 
* Add 64-bit MinGW config
* Don't use DisableTests for 64-bit MinGW, as it's necessary for at
least for the purpose of JS engine smoke check
* Sync configure flags with qt5.yaml, but not enable forced debug info
which causes build issues for both 32-bit and 64-bit configs

Change-Id: Iad5ff1459f8b39f17223da75b3319ab0cfc033d8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2020-03-05 04:12:11 +03: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
Konstantin Tokarev
b521ad483c Update platform_configs for QtWebKit 
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-01 14:24:48 +03: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