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
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
Jani Heikkinen
30b0d05343
Remove 'Packaging' feature from WinRT_10 x86
...
We don't deliver binaries for that target anymore -> do not export that
either
Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014
Reviewed-by: Antti Kokko <antti.kokko@qt.io >
2019-08-01 12:31:28 +03:00
Toni Saario
107fb06016
Fix extra file and missing library in platform configurations
...
Missing libraries in no-gui platform.
Default.txt was supposed to be removed by
439a1eb220
Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io >
2019-07-02 06:47:59 +00: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