diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-02 12:14:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-03 00:02:43 +0200 |
| commit | a94696ccd5be936099809eda58db02999cb7c77a (patch) | |
| tree | d8405a9848a24535aa86951305bdef035e4a7cc8 /coin/platform_configs/qtsdk.txt | |
| parent | 4c5d3f2e43008da3e7e96e7cbed31bc3bbf6cfab (diff) | |
| parent | 125c5e6528abee7796f6e5b68526bc050bd9250e (diff) | |
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
Diffstat (limited to 'coin/platform_configs/qtsdk.txt')
| -rw-r--r-- | coin/platform_configs/qtsdk.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/coin/platform_configs/qtsdk.txt b/coin/platform_configs/qtsdk.txt deleted file mode 100644 index ad320b09..00000000 --- a/coin/platform_configs/qtsdk.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features Configure arguments ---------------------------- ------------------- ----------- ----------- --------------- ---------------------------------------------------------------------------------------------------------------------------------------------------------- -qtci-windows-10-x86-3 MSVC2017 -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests -qtci-linux-RHEL-6.6-x86_64 GCC -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests |