Liang Qi 54c94ae681 Merge remote-tracking branch 'origin/5.15' into dev ...

Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c

2020-04-30 18:35:08 +02:00

..

default.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

flashing-wizard.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

meta-boot2qt.yaml

Change meta-boot2qt platform configs to Module only

2020-02-12 16:38:39 +00:00

ogl-runtime.yaml

Change configuration files into yaml format

2019-07-01 10:28:29 +02:00

qdb.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qt3d-runtime.yaml

Change configuration files into yaml format

2019-07-01 10:28:29 +02:00

qt5.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qt5compat.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtbase.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtdeclarative.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtgraphicaleffects.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtimageformats.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtnetworkauth.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtquick3d.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtquickcontrols2.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtsaferenderer.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtsdk.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtshadertools.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtsvg.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qttools.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtwayland.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtwebengine.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtwebkit.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

qtwebsockets.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

tqtc-qt-config-gui.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00

tqtc-qt-rta.yaml

Merge remote-tracking branch 'origin/5.15' into dev

2020-04-30 18:35:08 +02:00